Skip to content
Snippets Groups Projects
Commit 12ef00df authored by Mike Frysinger's avatar Mike Frysinger Committed by Dirk Pranke
Browse files

fix make output checks under C locale

Current versions of make use a simpler quoting style in the C locale.
Update the expected output to match.

Bug: 926296
Change-Id: I53b55a423808e5cd3b35e2a8ee404e78f8bde28d
Reviewed-on: https://chromium-review.googlesource.com/c/external/gyp/+/1697942


Reviewed-by: default avatarDirk Pranke <dpranke@chromium.org>
parent aca1e2c3
No related branches found
No related tags found
No related merge requests found
......@@ -573,7 +573,7 @@ class TestGypMake(TestGypBase):
message_target = 'all'
else:
message_target = target
kw['stdout'] = "make: Nothing to be done for `%s'.\n" % message_target
kw['stdout'] = "make: Nothing to be done for '%s'.\n" % message_target
return self.build(gyp_file, target, **kw)
def run_built_executable(self, name, *args, **kw):
"""
......@@ -1067,7 +1067,7 @@ class TestGypXcode(TestGypBase):
"PhaseScriptExecution /\\S+/Script-[0-9A-F]+\\.sh\n"
" cd /\\S+\n"
" /bin/sh -c /\\S+/Script-[0-9A-F]+\\.sh\n"
"(make: Nothing to be done for `all'\\.\n)?")
"(make: Nothing to be done for .all.\\.\n)?")
strip_up_to_date_expressions = [
# Various actions or rules can run even when the overall build target
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment