test/make_global_settings/ar/gyptest-make_global_settings_ar.py - Issue 1484333002: Derive default for ar_host from ar.

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/ar/gyptest-make_global_settings_ar.py

Issue 1484333002: Derive default for ar_host from ar. (Closed) Base URL: https://chromium.googlesource.com/external/gyp.git@master

Patch Set: Fix existing test Created 5 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:

Index: test/make_global_settings/ar/gyptest-make_global_settings_ar.py

diff --git a/test/make_global_settings/ar/gyptest-make_global_settings_ar.py b/test/make_global_settings/ar/gyptest-make_global_settings_ar.py

index b279a129d39dda8ac8f13026a7c9a2a7d0fbbe00..e6676de6bdd08690c9fa0134afcd902a0f73ae00 100644

--- a/test/make_global_settings/ar/gyptest-make_global_settings_ar.py

+++ b/test/make_global_settings/ar/gyptest-make_global_settings_ar.py

@@ -56,7 +56,10 @@ def verify_ar_host(test, ar=None, rel_path=False):

ar_expected = ar

# Resolve default values

if ar_expected is None:

- ar_expected = 'ar'

+ if sys.platform == 'win32':

+ ar_expected = 'lib.exe'

+ else:

+ ar_expected = 'ar'

if test.format == 'make':

test.must_contain('Makefile', 'AR.host ?= %s' % ar_expected)

elif test.format in ['ninja', 'xcode-ninja']:

« no previous file with comments | « pylib/gyp/generator/ninja.py ('k') | test/win/gyptest-crosscompile-ar.py » ('j') | no next file with comments »