| Index: test/make_global_settings/ld/gyptest-make_global_settings_ld.py
|
| diff --git a/test/make_global_settings/ld/gyptest-make_global_settings_ld.py b/test/make_global_settings/ld/gyptest-make_global_settings_ld.py
|
| index c0b0a38da819f1abf0f944e4dff933f5fa806700..c5a2e96422a9c18b3d197c7a2485a6cbf5079268 100644
|
| --- a/test/make_global_settings/ld/gyptest-make_global_settings_ld.py
|
| +++ b/test/make_global_settings/ld/gyptest-make_global_settings_ld.py
|
| @@ -17,7 +17,7 @@ def resolve_path(test, path):
|
| return None
|
| elif test.format == 'make':
|
| return '$(abspath %s)' % path
|
| - elif test.format == 'ninja':
|
| + elif test.format in ['ninja', 'xcode-ninja']:
|
| return os.path.join('..', '..', path)
|
| else:
|
| test.fail_test()
|
| @@ -36,14 +36,14 @@ def verify_ld_target(test, ld=None, rel_path=False):
|
| # break existing projects.
|
| test.must_not_contain('Makefile', 'LD ?= ')
|
| return
|
| - elif test.format == 'ninja':
|
| + elif test.format in ['ninja', 'xcode-ninja']:
|
| if sys.platform == 'win32':
|
| ld_expected = 'link.exe'
|
| else:
|
| ld_expected = '$cc'
|
| if test.format == 'make':
|
| test.must_contain('Makefile', 'LD ?= %s' % ld_expected)
|
| - elif test.format == 'ninja':
|
| + elif test.format in ['ninja', 'xcode-ninja']:
|
| test.must_contain('out/Default/build.ninja', 'ld = %s' % ld_expected)
|
| else:
|
| test.fail_test()
|
| @@ -62,14 +62,14 @@ def verify_ld_host(test, ld=None, rel_path=False):
|
| # break existing projects.
|
| test.must_not_contain('Makefile', 'LD.host ?= ')
|
| return
|
| - elif test.format == 'ninja':
|
| + elif test.format in ['ninja', 'xcode-ninja']:
|
| if sys.platform == 'win32':
|
| ld_expected = '$ld'
|
| else:
|
| ld_expected = '$cc_host'
|
| if test.format == 'make':
|
| test.must_contain('Makefile', 'LD.host ?= %s' % ld_expected)
|
| - elif test.format == 'ninja':
|
| + elif test.format in ['ninja', 'xcode-ninja']:
|
| test.must_contain('out/Default/build.ninja', 'ld_host = %s' % ld_expected)
|
| else:
|
| test.fail_test()
|
|
|