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

Unified Diff: test/generator-output/gyptest-copies.py

Issue 423753003: Pull in relevant targets when using xcode-ninja (Closed) Base URL: https://chromium.googlesource.com/external/gyp.git@Fix-Xcode-ninja-workspace-3
Patch Set: Rebase onto master Created 6 years, 5 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
« no previous file with comments | « test/generator-output/gyptest-actions.py ('k') | test/generator-output/gyptest-rules.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: test/generator-output/gyptest-copies.py
diff --git a/test/generator-output/gyptest-copies.py b/test/generator-output/gyptest-copies.py
index 7524b17e31dbc9713acd457682fcd979a85a1f7b..909aebf85f8a698540645aa6ff87609df74b32d0 100755
--- a/test/generator-output/gyptest-copies.py
+++ b/test/generator-output/gyptest-copies.py
@@ -18,6 +18,7 @@ test.writable(test.workpath('copies'), False)
test.run_gyp('copies.gyp',
'--generator-output=' + test.workpath('gypfiles'),
+ '-G', 'xcode_ninja_target_pattern=^(?!copies_null)',
chdir='copies')
test.writable(test.workpath('copies'), True)
@@ -39,7 +40,7 @@ test.must_match(['relocate', 'copies', 'copies-out', 'file1'],
if test.format == 'xcode':
chdir = 'relocate/copies/build'
-elif test.format in ['make', 'ninja', 'cmake']:
+elif test.format in ['make', 'ninja', 'xcode-ninja', 'cmake']:
chdir = 'relocate/gypfiles/out'
else:
chdir = 'relocate/gypfiles'
@@ -50,7 +51,7 @@ test.must_match(['relocate', 'copies', 'subdir', 'copies-out', 'file3'],
if test.format == 'xcode':
chdir = 'relocate/copies/subdir/build'
-elif test.format in ['make', 'ninja', 'cmake']:
+elif test.format in ['make', 'ninja', 'xcode-ninja', 'cmake']:
chdir = 'relocate/gypfiles/out'
else:
chdir = 'relocate/gypfiles'
« no previous file with comments | « test/generator-output/gyptest-actions.py ('k') | test/generator-output/gyptest-rules.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698