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

Unified Diff: test/linux/gyptest-target-rpath.py

Issue 1813053003: ninja: Add target_rpath generator flag (Closed) Base URL: https://chromium.googlesource.com/external/gyp.git@master
Patch Set: Add gyptest-target-rpath.py unit test Created 4 years, 9 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') | test/linux/target-rpath/file.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: test/linux/gyptest-target-rpath.py
diff --git a/test/linux/gyptest-implicit-rpath.py b/test/linux/gyptest-target-rpath.py
similarity index 71%
copy from test/linux/gyptest-implicit-rpath.py
copy to test/linux/gyptest-target-rpath.py
index dd7718c76dbf9209c6cb2fec3a622811abe7230e..2950a2026a2f8e83de593a42fde546638c6221bf 100644
--- a/test/linux/gyptest-implicit-rpath.py
+++ b/test/linux/gyptest-target-rpath.py
@@ -5,7 +5,7 @@
# found in the LICENSE file.
"""
-Verifies that the implicit rpath is added only when needed.
+Check target_rpath generator flag for ninja.
"""
import TestGyp
@@ -15,10 +15,10 @@ import subprocess
import sys
if sys.platform.startswith('linux'):
- test = TestGyp.TestGyp(formats=['ninja', 'make'])
+ test = TestGyp.TestGyp(formats=['ninja'])
- CHDIR = 'implicit-rpath'
- test.run_gyp('test.gyp', chdir=CHDIR)
+ CHDIR = 'target-rpath'
+ test.run_gyp('test.gyp', '-G', 'target_rpath=/usr/lib/gyptest/', chdir=CHDIR)
test.build('test.gyp', test.ALL, chdir=CHDIR)
def GetRpaths(p):
@@ -29,12 +29,7 @@ if sys.platform.startswith('linux'):
assert not proc.returncode
return r.findall(o)
- if test.format == 'ninja':
- expect = '$ORIGIN/lib/'
- elif test.format == 'make':
- expect = '$ORIGIN/lib.target/'
- else:
- test.fail_test()
+ expect = '/usr/lib/gyptest/'
if GetRpaths('shared_executable') != [expect]:
test.fail_test()
« no previous file with comments | « pylib/gyp/generator/ninja.py ('k') | test/linux/target-rpath/file.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698