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

Unified Diff: test/make_global_settings/ld/gyptest-make_global_settings_ld.py

Issue 335443007: Teach Ninja generator about 'LD'/'LD.host' specified in 'make_global_settings_ld' (Closed) Base URL: http://gyp.googlecode.com/svn/trunk
Patch Set: Rebase Created 6 years, 6 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 | « pylib/gyp/generator/ninja.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 fdea8a81ed8808b14c58ac56ba0c9ded57554e90..c0b0a38da819f1abf0f944e4dff933f5fa806700 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
@@ -96,9 +96,7 @@ verify_ld_host(test)
# Test 'LD' in 'make_global_settings'.
with TestGyp.LocalEnv({'GYP_CROSSCOMPILE': '1'}):
test.run_gyp('make_global_settings_ld.gyp', '-Dcustom_ld_target=my_ld')
-# TODO(yukawa): Support 'LD' in Ninja generator
-if test.format == 'make':
- verify_ld_target(test, ld='my_ld', rel_path=True)
+verify_ld_target(test, ld='my_ld', rel_path=True)
# Test 'LD'/'LD.host' in 'make_global_settings'.
@@ -106,10 +104,8 @@ with TestGyp.LocalEnv({'GYP_CROSSCOMPILE': '1'}):
test.run_gyp('make_global_settings_ld.gyp',
'-Dcustom_ld_target=my_ld_target1',
'-Dcustom_ld_host=my_ld_host1')
-# TODO(yukawa): Support 'LD'/'LD.host' in Ninja generator
-if test.format == 'make':
- verify_ld_target(test, ld='my_ld_target1', rel_path=True)
- verify_ld_host(test, ld='my_ld_host1', rel_path=True)
+verify_ld_target(test, ld='my_ld_target1', rel_path=True)
+verify_ld_host(test, ld='my_ld_host1', rel_path=True)
# Unlike other environment variables such as $AR/$AR_host, $CC/$CC_host,
« no previous file with comments | « pylib/gyp/generator/ninja.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698