wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1153970 - Change js/src/gdb/run-tests.py to take an OBJDIR argument instead of a LIBDIR argument, since jorendorff can never guess which directory to pass for LIBDIR in fewer than six tries. r=jimb.

Browse Source
This commit is contained in:
Jason Orendorff 2015-04-13 11:36:36 -05:00
parent a00943dde1
commit 735d6acedb
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/src/gdb/README
View File

@ -137,11 +137,11 @@ Running the unit tests
These extensions have unit tests, invoked as follows:
$ python run-tests.py [OPTIONS] LIBDIR [TESTS...]
$ python run-tests.py [OPTIONS] OBJDIR [TESTS...]
where LIBDIR is a directory containing a compiled SpiderMonkey library,
libmozjs.so; TESTS are names of selected tests to run (if omitted, we run
them all); and OPTIONS are drawn from the list below.
where OBJDIR is a directory containing a standalone SpiderMonkey build; TESTS
are names of selected tests to run (if omitted, we run them all); and OPTIONS
are drawn from the list below.
--gdb=EXECUTABLE
Instead of running whatever 'gdb' we find in our search path, use

17
js/src/gdb/run-tests.py
View File

@ -157,7 +157,7 @@ class Test(TaskPool.Task):
'-nw', # Don't create a window (unnecessary?)
'-nx', # Don't read .gdbinit.
'--ex', 'add-auto-load-safe-path %s' % (OPTIONS.builddir,),
'--ex', 'set env LD_LIBRARY_PATH %s' % (OPTIONS.libdir,),
'--ex', 'set env LD_LIBRARY_PATH %s' % os.path.join(OPTIONS.objdir, 'js', 'src'),
'--ex', 'file %s' % (os.path.join(OPTIONS.builddir, 'gdb-tests'),),
'--eval-command', 'python testlibdir=%r' % (testlibdir,),
'--eval-command', 'python testscript=%r' % (self.test_path,),
@ -230,13 +230,13 @@ def main(argv):
script_path = os.path.abspath(__file__)
script_dir = os.path.dirname(script_path)
# LIBDIR is the directory in which we find the SpiderMonkey shared
# library, to link against.
# OBJDIR is a standalone SpiderMonkey build directory. This is where we
# find the SpiderMonkey shared library to link against.
#
# The [TESTS] optional arguments are paths of test files relative
# to the jit-test/tests directory.
from optparse import OptionParser
op = OptionParser(usage='%prog [options] LIBDIR [TESTS...]')
op = OptionParser(usage='%prog [options] OBJDIR [TESTS...]')
op.add_option('-s', '--show-cmd', dest='show_cmd', action='store_true',
help='show GDB shell command run')
op.add_option('-o', '--show-output', dest='show_output', action='store_true',
@ -269,16 +269,17 @@ def main(argv):
help='Build test executable in [BUILDDIR].')
(OPTIONS, args) = op.parse_args(argv)
if len(args) < 1:
op.error('missing LIBDIR argument')
OPTIONS.libdir = os.path.abspath(args[0])
op.error('missing OBJDIR argument')
OPTIONS.objdir = os.path.abspath(args[0])
test_args = args[1:]
if not OPTIONS.workercount:
OPTIONS.workercount = get_cpu_count()
# Compute default for OPTIONS.builddir now, since we've computed OPTIONS.libdir.
# Compute default for OPTIONS.builddir now, since we've computed OPTIONS.objdir.
if not OPTIONS.builddir:
OPTIONS.builddir = os.path.join(OPTIONS.libdir, 'gdb')
OPTIONS.builddir = os.path.join(OPTIONS.objdir, 'js', 'src', 'gdb')
test_set = set()