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

Unified Diff: test/lib/TestGyp.py

Issue 9014002: Let ninja/mac pass all gyp tests. (Closed) Base URL: http://gyp.googlecode.com/svn/trunk/
Patch Set: '' Created 9 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « test/dependencies/gyptest-lib-only.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: test/lib/TestGyp.py
===================================================================
--- test/lib/TestGyp.py (revision 1111)
+++ test/lib/TestGyp.py (working copy)
@@ -449,6 +449,11 @@
def run_built_executable(self, name, *args, **kw):
# Enclosing the name in a list avoids prepending the original dir.
program = [self.built_file_path(name, type=self.EXECUTABLE, **kw)]
+ if sys.platform == 'darwin':
+ libdir = os.path.join('out', 'Default', 'lib')
+ if self.configuration:
+ libdir = os.path.join('out', self.configuration, 'lib')
+ os.environ['DYLD_LIBRARY_PATH'] = libdir
tony 2011/12/20 23:36:11 Why is this different from the make/xcodebuild?
Nico 2011/12/20 23:54:38 The make build runs its compilations from the sour
return self.run(program=program, *args, **kw)
def built_file_path(self, name, type=None, **kw):
@@ -458,9 +463,10 @@
result.append(chdir)
result.append('out')
result.append(self.configuration_dirname())
- if type in (self.STATIC_LIB,):
- result.append('obj')
- elif type in (self.SHARED_LIB,):
+ if type == self.STATIC_LIB:
+ if sys.platform != 'darwin':
tony 2011/12/20 23:36:11 Why is this different from the make/xcodebuild? N
Nico 2011/12/20 23:54:38 It's not, make and xcodebuild both put their stati
+ result.append('obj')
+ elif type == self.SHARED_LIB:
result.append('lib')
subdir = kw.get('subdir')
if subdir:
« no previous file with comments | « test/dependencies/gyptest-lib-only.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698