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

Index: test/make_global_settings/full-toolchain/gyptest-make_global_settings.py

diff --git a/test/make_global_settings/full-toolchain/gyptest-make_global_settings.py b/test/make_global_settings/full-toolchain/gyptest-make_global_settings.py

index 0dd148c229217f8b13369762b7af66461d0a503a..eebda7d49797a922ad4e4b0c430ac2971796fd92 100644

--- a/test/make_global_settings/full-toolchain/gyptest-make_global_settings.py

+++ b/test/make_global_settings/full-toolchain/gyptest-make_global_settings.py

@@ -27,7 +27,7 @@ test = TestGyp.TestGyp(formats=['ninja'])

# Note that we can't just pass format=['ninja-some_toolchain'] to the

# constructor above, because then this test wouldn't be recognized as a ninja

# format test.

-test.formats = ['ninja-some_flavor']

+test.formats = ['ninja-my_flavor' if f == 'ninja' else f for f in test.formats]

gyp_file = 'make_global_settings.gyp'

@@ -36,7 +36,8 @@ test.run_gyp(gyp_file,

# my_readelf.py, and the python executable.

'-Dworkdir=%s' % test.workdir,

'-Dpython=%s' % sys.executable)

-test.build(gyp_file, arguments=['-v'])

+test.build(gyp_file,

+ arguments=['-v'] if test.format == 'ninja-my_flavor' else [])

expected = ['MY_CC', 'MY_CXX']

test.must_contain_all_lines(test.stdout(), expected)