test/make_global_settings/env-wrapper/gyptest-wrapper.py - Issue 23475025: ninja/mac: Don't link c-file-only targets to libstdc++

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: test/make_global_settings/env-wrapper/gyptest-wrapper.py

Issue 23475025: ninja/mac: Don't link c-file-only targets to libstdc++ Base URL: http://gyp.googlecode.com/svn/trunk/

Patch Set: Created 7 years, 3 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 unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 #!/usr/bin/env python	1 #!/usr/bin/env python

2	2

3 # Copyright (c) 2013 Google Inc. All rights reserved.	3 # Copyright (c) 2013 Google Inc. All rights reserved.

4 # Use of this source code is governed by a BSD-style license that can be	4 # Use of this source code is governed by a BSD-style license that can be

5 # found in the LICENSE file.	5 # found in the LICENSE file.

6	6

7 """	7 """

8 Verifies *_wrapper in environment.	8 Verifies *_wrapper in environment.

9 """	9 """

10	10

(...skipping 13 matching lines...) Expand all Loading...
24 os.environ['GYP_CROSSCOMPILE'] = '1'	24 os.environ['GYP_CROSSCOMPILE'] = '1'

25 test.run_gyp('wrapper.gyp')	25 test.run_gyp('wrapper.gyp')

26 os.environ.clear()	26 os.environ.clear()

27 os.environ.update(old_env)	27 os.environ.update(old_env)

28	28

29 if test.format == 'ninja':	29 if test.format == 'ninja':

30 cc_expected = ('cc = ' + os.path.join('..', '..', 'distcc') + ' ' +	30 cc_expected = ('cc = ' + os.path.join('..', '..', 'distcc') + ' ' +

31 os.path.join('..', '..', 'clang'))	31 os.path.join('..', '..', 'clang'))

32 cc_host_expected = ('cc_host = ' + os.path.join('..', '..', 'ccache') + ' ' +	32 cc_host_expected = ('cc_host = ' + os.path.join('..', '..', 'ccache') + ' ' +

33 os.path.join('..', '..', 'clang'))	33 os.path.join('..', '..', 'clang'))

34 ld_expected = 'ld = ../../distlink $cxx'	34 ld_expected = 'ld = ../../distlink $cc'

	35 ldxx_expected = 'ldxx = ../../distlink $cxx'

35 if sys.platform == 'win32':	36 if sys.platform == 'win32':

36 ld_expected = 'link.exe'	37 ld_expected = 'link.exe'

37 test.must_contain('out/Default/build.ninja', cc_expected)	38 test.must_contain('out/Default/build.ninja', cc_expected)

38 test.must_contain('out/Default/build.ninja', cc_host_expected)	39 test.must_contain('out/Default/build.ninja', cc_host_expected)

39 test.must_contain('out/Default/build.ninja', ld_expected)	40 test.must_contain('out/Default/build.ninja', ld_expected)

	41 test.must_contain('out/Default/build.ninja', ldxx_expected)

40	42

41 test.pass_test()	43 test.pass_test()

OLD	NEW