| 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'
|
|
|