Bug 1291954 - Skip tests that depend on the wasm signal handler, since tsan interferes with it, r=jonco

--HG--
extra : rebase_source : 243f008d4e4ca2430895eb3c37ccea06efe1e2b4
extra : histedit_source : 5cb45de1f1c958c2a03bb0c82c4cef17615958f4
This commit is contained in:
Steve Fink 2017-05-04 18:29:54 -07:00
Родитель c9a7edcd58
Коммит a1bac09186
3 изменённых файлов: 20 добавлений и 6 удалений

Просмотреть файл

@ -0,0 +1,10 @@
asm.js/testTimeout1.js
asm.js/testTimeout2.js
asm.js/testTimeout3.js
asm.js/testTimeout4.js
asm.js/testTimeout5.js
asm.js/testTimeout6.js
basic/spread-call-maxarg.js
basic/spread-call-near-maxarg.js
ion/iloop.js
wasm/timeout

Просмотреть файл

@ -5,7 +5,7 @@
"compiler": "clang", "compiler": "clang",
"env": { "env": {
"LLVM_SYMBOLIZER": "{TOOLTOOL_CHECKOUT}/clang/bin/llvm-symbolizer", "LLVM_SYMBOLIZER": "{TOOLTOOL_CHECKOUT}/clang/bin/llvm-symbolizer",
"JITTEST_EXTRA_ARGS": "--jitflags=tsan --ignore-timeouts={DIR}/cgc-jittest-timeouts.txt --unusable-error-status", "JITTEST_EXTRA_ARGS": "--jitflags=tsan --ignore-timeouts={DIR}/cgc-jittest-timeouts.txt --unusable-error-status --exclude-from={DIR}/tsan-sighandlers.txt",
"JSTESTS_EXTRA_ARGS": "--exclude-file={DIR}/cgc-jstests-slow.txt", "JSTESTS_EXTRA_ARGS": "--exclude-file={DIR}/cgc-jstests-slow.txt",
"TSAN_OPTIONS": "exitcode=0 log_path={OUTDIR}/sanitize_log" "TSAN_OPTIONS": "exitcode=0 log_path={OUTDIR}/sanitize_log"
}, },

Просмотреть файл

@ -73,8 +73,11 @@ def main(argv):
action='store_true', action='store_true',
help="don't print output for failed tests" help="don't print output for failed tests"
" (no-op with --show-output)") " (no-op with --show-output)")
op.add_option('-x', '--exclude', dest='exclude', action='append', op.add_option('-x', '--exclude', dest='exclude',
default=[], action='append',
help='exclude given test dir or path') help='exclude given test dir or path')
op.add_option('--exclude-from', dest='exclude_from', type=str,
help='exclude each test dir or path in FILE')
op.add_option('--slow', dest='run_slow', action='store_true', op.add_option('--slow', dest='run_slow', action='store_true',
help='also run tests marked as slow') help='also run tests marked as slow')
op.add_option('--no-slow', dest='run_slow', action='store_false', op.add_option('--no-slow', dest='run_slow', action='store_false',
@ -234,10 +237,11 @@ def main(argv):
# If code coverage is enabled, exclude tests. (bug 1347245) # If code coverage is enabled, exclude tests. (bug 1347245)
if os.getenv('GCOV_PREFIX') is not None: if os.getenv('GCOV_PREFIX') is not None:
if options.exclude: options.exclude += ['asm.js/testSIMD.js']
options.exclude += ['asm.js/testSIMD.js']
else: if options.exclude_from:
options.exclude = ['asm.js/testSIMD.js'] with open(options.exclude_from) as fh:
options.exclude += [_.strip() for _ in fh]
if options.exclude: if options.exclude:
exclude_list = [] exclude_list = []