test/make_global_settings/ld/gyptest-make_global_settings_ld.py - Issue 421453003: Add TestGypXcodeNinja to run tests against the xcode-ninja generator

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: test/make_global_settings/ld/gyptest-make_global_settings_ld.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/make_global_settings/full-toolchain/gyptest-make_global_settings.py ('k') | test/many-actions/gyptest-many-actions-unsorted.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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()