Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(563)

Unified Diff: test/make_global_settings/ar/gyptest-make_global_settings_ar.py

Issue 421453003: Add TestGypXcodeNinja to run tests against the xcode-ninja generator (Closed) Base URL: https://chromium.googlesource.com/external/gyp.git@master
Patch Set: Rebase onto origin/master Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: test/make_global_settings/ar/gyptest-make_global_settings_ar.py
diff --git a/test/make_global_settings/ar/gyptest-make_global_settings_ar.py b/test/make_global_settings/ar/gyptest-make_global_settings_ar.py
index f935e2353900f3b5f6a3b7e5abf848fb00fb37c7..b279a129d39dda8ac8f13026a7c9a2a7d0fbbe00 100644
--- a/test/make_global_settings/ar/gyptest-make_global_settings_ar.py
+++ b/test/make_global_settings/ar/gyptest-make_global_settings_ar.py
@@ -17,7 +17,7 @@ def resolve_path(test, path):
return None
elif test.format == 'make':
return '$(abspath %s)' % path
- elif test.format == 'ninja':
+ elif test.format in ['ninja', 'xcode-ninja']:
return os.path.join('..', '..', path)
else:
test.fail_test()
@@ -36,14 +36,14 @@ def verify_ar_target(test, ar=None, rel_path=False):
# break existing projects.
test.must_not_contain('Makefile', 'AR ?= ')
return
- elif test.format == 'ninja':
+ elif test.format in ['ninja', 'xcode-ninja']:
if sys.platform == 'win32':
ar_expected = 'lib.exe'
else:
ar_expected = 'ar'
if test.format == 'make':
test.must_contain('Makefile', 'AR ?= %s' % ar_expected)
- elif test.format == 'ninja':
+ elif test.format in ['ninja', 'xcode-ninja']:
test.must_contain('out/Default/build.ninja', 'ar = %s' % ar_expected)
else:
test.fail_test()
@@ -59,7 +59,7 @@ def verify_ar_host(test, ar=None, rel_path=False):
ar_expected = 'ar'
if test.format == 'make':
test.must_contain('Makefile', 'AR.host ?= %s' % ar_expected)
- elif test.format == 'ninja':
+ elif test.format in ['ninja', 'xcode-ninja']:
test.must_contain('out/Default/build.ninja', 'ar_host = %s' % ar_expected)
else:
test.fail_test()
« no previous file with comments | « test/mac/gyptest-type-envvars.py ('k') | test/make_global_settings/full-toolchain/gyptest-make_global_settings.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698