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

Unified Diff: test/library_dirs/gyptest-library-dirs.py

Issue 24792003: homogenize msvs and ninja library_dir and libraries settings for Windows (Closed) Base URL: https://chromium.googlesource.com/external/gyp.git@master
Patch Set: reland r1743 with fixed test case 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « pylib/gyp/msvs_emulation.py ('k') | test/library_dirs/subdir/test.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: test/library_dirs/gyptest-library-dirs.py
diff --git a/test/library_dirs/gyptest-library-dirs.py b/test/library_dirs/gyptest-library-dirs.py
index a201d5978e6dfc797383a742d0e52c27f8777ae6..5edd6e757918e62d2b579723bbd5ce0a1d713dd2 100644
--- a/test/library_dirs/gyptest-library-dirs.py
+++ b/test/library_dirs/gyptest-library-dirs.py
@@ -8,6 +8,8 @@
Verifies library_dirs (in link_settings) are properly found.
"""
+import sys
+
import TestGyp
test = TestGyp.TestGyp(formats=['!android'])
@@ -29,5 +31,20 @@ expect = """Hello world
test.run_built_executable(
'libraries-search-path-test', chdir='subdir', stdout=expect)
+if sys.platform in ('win32', 'cygwin'):
+ test.run_gyp('test-win.gyp',
+ '-D',
+ 'abs_path_to_secret_library_location={0}'.format(lib_dir),
+ chdir='subdir')
+
+ test.build('test.gyp', 'mylib', chdir='subdir')
+ test.build('test-win.gyp',
+ 'libraries-search-path-test-lib-suffix',
+ chdir='subdir')
+
+ test.run_built_executable(
+ 'libraries-search-path-test-lib-suffix', chdir='subdir', stdout=expect)
+
+
test.pass_test()
test.cleanup()
« 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