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

Unified Diff: test/additional-targets/gyptest-additional.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
« no previous file with comments | « test/actions/gyptest-default.py ('k') | test/build-option/gyptest-build.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: test/additional-targets/gyptest-additional.py
diff --git a/test/additional-targets/gyptest-additional.py b/test/additional-targets/gyptest-additional.py
index a9bd40272201ce660d8a441110054c8bc71bf3cb..fcea0d573c10ffe8e0c0a0a7a5e08be96697f1a8 100755
--- a/test/additional-targets/gyptest-additional.py
+++ b/test/additional-targets/gyptest-additional.py
@@ -12,7 +12,10 @@ import TestGyp
test = TestGyp.TestGyp()
-test.run_gyp('all.gyp', chdir='src')
+test.run_gyp('all.gyp',
+ '-G', 'xcode_ninja_target_pattern=^all_targets$',
+ chdir='src')
+
test.relocate('src', 'relocate/src')
# Build all.
@@ -32,6 +35,10 @@ test.built_file_must_not_exist('foolib1',
type=test.SHARED_LIB,
chdir=chdir)
+# xcode-ninja doesn't generate separate workspaces for sub-gyps by design
+if test.format == 'xcode-ninja':
+ test.pass_test()
+
# TODO(mmoss) Make consistent with msvs, with 'dir1' before 'out/Default'?
if test.format in ('make', 'ninja', 'android', 'cmake'):
chdir='relocate/src'
« no previous file with comments | « test/actions/gyptest-default.py ('k') | test/build-option/gyptest-build.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698