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

Unified Diff: test/intermediate_dir/gyptest-intermediate-dir.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/intermediate_dir/gyptest-intermediate-dir.py
diff --git a/test/intermediate_dir/gyptest-intermediate-dir.py b/test/intermediate_dir/gyptest-intermediate-dir.py
index 0e1020ef314e0abe601e41a084526dfaad6adf29..8f9c270ca3284fcbe5f485cbae6473973c5d3fed 100755
--- a/test/intermediate_dir/gyptest-intermediate-dir.py
+++ b/test/intermediate_dir/gyptest-intermediate-dir.py
@@ -12,7 +12,10 @@ import TestGyp
test = TestGyp.TestGyp()
-test.run_gyp('test.gyp', chdir='src')
+test.run_gyp('test.gyp',
+ '-G', 'xcode_ninja_target_pattern=^target1$',
+ chdir='src')
+
test.build('test.gyp', 'target1', chdir='src')
# Check stuff exists.
intermediate_file1 = test.read('src/outfile.txt')
@@ -21,7 +24,10 @@ test.must_contain(intermediate_file1, 'target1')
shared_intermediate_file1 = test.read('src/shared_outfile.txt')
test.must_contain(shared_intermediate_file1, 'shared_target1')
-test.run_gyp('test2.gyp', chdir='src')
+test.run_gyp('test2.gyp',
+ '-G', 'xcode_ninja_target_pattern=^target2$',
+ chdir='src')
+
# Force the shared intermediate to be rebuilt.
test.sleep()
test.touch('src/shared_infile.txt')

Powered by Google App Engine
This is Rietveld 408576698