Revision: 9085
Author: [email protected]
Date: Wed Aug 31 07:15:42 2011
Log: Add support for shared library builds to
tools/test-wrapper-gypbuild.py
by setting LD_LIBRARY_PATH as required
Review URL: http://codereview.chromium.org/7811016
http://code.google.com/p/v8/source/detail?r=9085
Modified:
/branches/bleeding_edge/build/all.gyp
/branches/bleeding_edge/test/cctest/cctest.gyp
/branches/bleeding_edge/tools/test-wrapper-gypbuild.py
=======================================
--- /branches/bleeding_edge/build/all.gyp Fri Aug 5 02:44:30 2011
+++ /branches/bleeding_edge/build/all.gyp Wed Aug 31 07:15:42 2011
@@ -11,13 +11,7 @@
'../preparser/preparser.gyp:*',
'../samples/samples.gyp:*',
'../src/d8.gyp:d8',
- ],
- 'conditions': [
- [ 'component!="shared_library"', {
- 'dependencies': [
- '../test/cctest/cctest.gyp:*',
- ],
- }]
+ '../test/cctest/cctest.gyp:*',
],
}
]
=======================================
--- /branches/bleeding_edge/test/cctest/cctest.gyp Thu Aug 25 07:50:09 2011
+++ /branches/bleeding_edge/test/cctest/cctest.gyp Wed Aug 31 07:15:42 2011
@@ -35,7 +35,6 @@
'target_name': 'cctest',
'type': 'executable',
'dependencies': [
- '../../tools/gyp/v8.gyp:v8',
'resources',
],
'include_dirs': [
@@ -136,6 +135,20 @@
'test-platform-win32.cc',
],
}],
+ ['component=="shared_library"', {
+ # cctest can't be built against a shared library, so we need to
+ # depend on the underlying static target in that case.
+ 'conditions': [
+ ['v8_use_snapshot=="true"', {
+ 'dependencies': ['../../tools/gyp/v8.gyp:v8_snapshot'],
+ },
+ {
+ 'dependencies': ['../../tools/gyp/v8.gyp:v8_nosnapshot'],
+ }],
+ ],
+ }, {
+ 'dependencies': ['../../tools/gyp/v8.gyp:v8'],
+ }],
],
},
{
=======================================
--- /branches/bleeding_edge/tools/test-wrapper-gypbuild.py Wed Aug 31
06:01:28 2011
+++ /branches/bleeding_edge/tools/test-wrapper-gypbuild.py Wed Aug 31
07:15:42 2011
@@ -215,17 +215,21 @@
for arg in args:
args_for_children += [arg]
returncodes = 0
+ env = os.environ
for mode in options.mode:
for arch in options.arch:
print ">>> running tests for %s.%s" % (arch, mode)
- shell = workspace + '/' + options.outdir + '/' + arch + '.' + mode
+ "/d8"
+ shellpath = workspace + '/' + options.outdir + '/' + arch + '.' +
mode
+ env['LD_LIBRARY_PATH'] = shellpath + '/lib.target'
+ shell = shellpath + "/d8"
child = subprocess.Popen(' '.join(args_for_children +
['--arch=' + arch] +
['--mode=' + mode] +
['--shell=' + shell]),
shell=True,
- cwd=workspace)
+ cwd=workspace,
+ env=env)
returncodes += child.wait()
return returncodes
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
