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

Side by Side Diff: test/library_dirs/gyptest-library-dirs.py

Issue 25594002: Revert homogenize msvs and ninja library_dir and libraries settings for (Closed) Base URL: http://gyp.googlecode.com/svn/trunk
Patch Set: Created 7 years, 2 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
« no previous file with comments | « pylib/gyp/msvs_emulation.py ('k') | test/library_dirs/subdir/test.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 library_dirs (in link_settings) are properly found. 8 Verifies library_dirs (in link_settings) are properly found.
9 """ 9 """
10 10
11 import sys
12
13 import TestGyp 11 import TestGyp
14 12
15 test = TestGyp.TestGyp(formats=['!android']) 13 test = TestGyp.TestGyp(formats=['!android'])
16 14
17 lib_dir = test.tempdir('secret_location') 15 lib_dir = test.tempdir('secret_location')
18 16
19 test.run_gyp('test.gyp', 17 test.run_gyp('test.gyp',
20 '-D', 'abs_path_to_secret_library_location={0}'.format(lib_dir), 18 '-D', 'abs_path_to_secret_library_location={0}'.format(lib_dir),
21 chdir='subdir') 19 chdir='subdir')
22 20
23 # Must build each target independently, since they are not in each others' 21 # Must build each target independently, since they are not in each others'
24 # 'dependencies' (test.ALL does NOT work here for some builders, and in any case 22 # 'dependencies' (test.ALL does NOT work here for some builders, and in any case
25 # would not ensure the correct ordering). 23 # would not ensure the correct ordering).
26 test.build('test.gyp', 'mylib', chdir='subdir') 24 test.build('test.gyp', 'mylib', chdir='subdir')
27 test.build('test.gyp', 'libraries-search-path-test', chdir='subdir') 25 test.build('test.gyp', 'libraries-search-path-test', chdir='subdir')
28 26
29 expect = """Hello world 27 expect = """Hello world
30 """ 28 """
31 test.run_built_executable( 29 test.run_built_executable(
32 'libraries-search-path-test', chdir='subdir', stdout=expect) 30 'libraries-search-path-test', chdir='subdir', stdout=expect)
33 31
34 if sys.platform in ('win32', 'cygwin'):
35 test.run_gyp('test-win.gyp',
36 '-D',
37 'abs_path_to_secret_library_location={0}'.format(lib_dir),
38 chdir='subdir')
39
40 test.build('test.gyp', 'mylib', chdir='subdir')
41 test.build('test-win.gyp',
42 'libraries-search-path-test-lib-suffix',
43 chdir='subdir')
44
45 test.run_built_executable(
46 'libraries-search-path-test-lib-suffix', chdir='subdir', stdout=expect)
47
48
49 test.pass_test() 32 test.pass_test()
50 test.cleanup() 33 test.cleanup()
OLDNEW
« no previous file with comments | « pylib/gyp/msvs_emulation.py ('k') | test/library_dirs/subdir/test.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698