Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-07 07:04:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 932940 - Jit-test harness needs to set different remote --js-cache; r=terrence

Browse Source
This commit is contained in:
Dan Minor 2013-11-04 09:34:48 -05:00
parent 210cfde910
commit d738066181
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/src/jit-test/jit_test.py
View File

@ -196,7 +196,6 @@ def main(argv):
prolog = posixpath.join(options.remote_test_root, 'jit-tests', 'jit-tests', 'lib', 'prolog.js')
prefix += ['-f', prolog]
prefix += ['--js-cache', jittests.JS_CACHE_DIR]
# Avoid racing on the cache by having the js shell create a new cache
# subdir for each process. The js shell takes care of deleting these

7
js/src/tests/lib/jittests.py
View File

@ -101,6 +101,7 @@ class Test:
return t
COOKIE = '|jit-test|'
CacheDir = JS_CACHE_DIR
@classmethod
def from_file(cls, path, options):
@ -179,7 +180,8 @@ class Test:
# We may have specified '-a' or '-d' twice: once via --jitflags, once
# via the "|jit-test|" line. Remove dups because they are toggles.
cmd = prefix + list(set(self.jitflags)) + ['-e', expr, '-f', path]
cmd = prefix + ['--js-cache', Test.CacheDir]
cmd += list(set(self.jitflags)) + ['-e', expr, '-f', path]
if self.valgrind:
cmd = self.VALGRIND_CMD + cmd
return cmd
@ -656,6 +658,9 @@ def run_tests_remote(tests, prefix, options):
push_progs(options, dm, [prefix[0]])
dm.chmodDir(options.remote_test_root)
Test.CacheDir = posixpath.join(options.remote_test_root, '.js-cache')
dm.mkDirs(Test.CacheDir)
dm.pushDir(ECMA6_DIR, posixpath.join(jit_tests_dir, 'tests', 'ecma_6'), timeout=600)
dm.pushDir(os.path.dirname(TEST_DIR), options.remote_test_root, timeout=600)
prefix[0] = os.path.join(options.remote_test_root, 'js')