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

Unified Diff: test/compiler-override/gyptest-compiler-env.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-env.py
diff --git a/test/compiler-override/gyptest-compiler-env.py b/test/compiler-override/gyptest-compiler-env.py
index d13d692dc6e3f62a9d8d046856c7d823b2d6a579..014fa5429b154acdd6e014b8ce68faf37a81b198 100755
--- a/test/compiler-override/gyptest-compiler-env.py
+++ b/test/compiler-override/gyptest-compiler-env.py
@@ -39,7 +39,9 @@ test = TestGyp.TestGyp(formats=['ninja', 'make'])
def TestTargetOveride():
expected = ['my_cc.py', 'my_cxx.py', 'FOO' ]
- if test.format != 'ninja': # ninja just uses $CC / $CXX as linker.
+
+ # ninja just uses $CC / $CXX as linker.
+ if test.format not in ['ninja', 'xcode-ninja']:
expected.append('FOO_LINK')
# Check that CC, CXX and LD set target compiler
@@ -107,6 +109,9 @@ def TestHostOveride():
TestTargetOveride()
TestTargetOverideCompilerOnly()
-TestHostOveride()
+
+# The xcode generator chokes on the 'host' toolset.
sdefresne 2014/09/02 15:13:05 Is this a bug or by design?
Tobias 2014/10/02 18:19:19 I can't reproduce this one any more. I've removed
+if test.format != 'xcode-ninja':
+ TestHostOveride()
test.pass_test()

Powered by Google App Engine
This is Rietveld 408576698