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

Unified Diff: test/compiler-override/gyptest-compiler-global-settings.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, 4 months 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/compiler-override/gyptest-compiler-global-settings.py
diff --git a/test/compiler-override/gyptest-compiler-global-settings.py b/test/compiler-override/gyptest-compiler-global-settings.py
index a4f5ddb5b64cd0f2c1001e1d7abf3deb784dac78..c05d3bb3bd730c7e983bfd7a729da034c7995664 100755
--- a/test/compiler-override/gyptest-compiler-global-settings.py
+++ b/test/compiler-override/gyptest-compiler-global-settings.py
@@ -43,6 +43,11 @@ os.environ.update(old_env)
test.build(gypfile)
test.must_contain_all_lines(test.stdout(), ['my_cc.py', 'my_cxx.py', 'FOO'])
+# The xcode generator chokes on the 'host' toolset.
sdefresne 2014/09/02 15:13:05 Same question here.
Tobias 2014/10/02 18:19:19 This test is testing a feature that is apparently
+# Skip the rest of this test.
+if test.format == 'xcode-ninja':
+ test.pass_test()
+
# Same again but with the host toolset.
replacements['TOOLSET'] = 'host'
s = Template(open(gypfile + '.in').read())

Powered by Google App Engine
This is Rietveld 408576698