From 18d82682d1b57db7df771f34ce1e6503df1c5b83 Mon Sep 17 00:00:00 2001 From: Michael Starzinger Date: Wed, 7 Jun 2017 15:50:31 +0200 Subject: [PATCH] [test] Remove dead and unmaintained test variants. The two variants "turbofan" and "turbofan_opt" are not part of any of the default sets of variants that run-tests.py uses. The only way to trigger execution would be via the --variants flag directly, which our infrastructure is not doing. R=machenbach@chromium.org Change-Id: Ifa58cb4a83a3760ffba73e8b40b417a845f53506 Reviewed-on: https://chromium-review.googlesource.com/526637 Reviewed-by: Michael Achenbach Commit-Queue: Michael Starzinger Cr-Commit-Position: refs/heads/master@{#45772} --- test/cctest/cctest.status | 12 ------------ test/debugger/debugger.status | 6 ------ test/mjsunit/mjsunit.status | 14 -------------- test/mozilla/mozilla.status | 12 ------------ tools/testrunner/local/variants.py | 8 ++------ 5 files changed, 2 insertions(+), 50 deletions(-) diff --git a/test/cctest/cctest.status b/test/cctest/cctest.status index ecc93539e0..b1c82d327a 100644 --- a/test/cctest/cctest.status +++ b/test/cctest/cctest.status @@ -402,18 +402,6 @@ }], # 'arch == ppc64 and simulator_run == True' -############################################################################## -['variant == turbofan_opt', { - # BUG(v8:5457) - 'test-api/SetJitCodeEventHandler': [PASS, ['no_snap', SKIP]], -}], # variant == turbofan_opt - -############################################################################## -['variant == turbofan', { - # BUG(4751). Flaky with Ignition. - 'test-cpu-profiler/JsNativeJsSample': [SKIP], -}], # variant == turbofan - ############################################################################## ['variant == noturbofan and no_snap', { # Too slow for old pipeline and nosnap. diff --git a/test/debugger/debugger.status b/test/debugger/debugger.status index 27891aaed3..359de35d83 100644 --- a/test/debugger/debugger.status +++ b/test/debugger/debugger.status @@ -62,12 +62,6 @@ 'debug/es8/async-function-debug-scopes': [SKIP], }], # 'gc_stress == True' -############################################################################## -['variant == turbofan_opt', { - # TODO(jarin/mstarzinger): Investigate debugger issues with TurboFan. - 'debug/debug-evaluate-locals': [FAIL], -}], # variant == turbofan_opt - ############################################################################## ['variant == wasm_traps', { '*': [SKIP], diff --git a/test/mjsunit/mjsunit.status b/test/mjsunit/mjsunit.status index d18e20424d..f8f9f9522f 100644 --- a/test/mjsunit/mjsunit.status +++ b/test/mjsunit/mjsunit.status @@ -633,20 +633,6 @@ 'harmony/futex': [SKIP], }], # variant == noturbofan and no_snap -############################################################################## -['variant == turbofan_opt', { - 'es6/array-iterator-turbo': [SKIP], - - # TODO(jgruber): Fails in --turbo --always-opt mode. - 'regress/regress-105': [FAIL], - - # Too slow. - 'big-object-literal': [SKIP], - 'ignition/regress-599001-verifyheap': [SKIP], - 'unicode-test': [SKIP], - -}], # variant == turbofan_opt - ############################################################################## ['gcov_coverage', { # Tests taking too long. diff --git a/test/mozilla/mozilla.status b/test/mozilla/mozilla.status index 9793b57c45..9c900986d9 100644 --- a/test/mozilla/mozilla.status +++ b/test/mozilla/mozilla.status @@ -865,18 +865,6 @@ }], # ALWAYS -['variant == turbofan_opt', { - # These timeout flakily under CFI/turbofan_opt - 'js1_5/Regress/regress-360969-05': [SKIP], - 'js1_5/Regress/regress-360969-06': [SKIP], - - # These timeout under CFI/turbofan_opt - 'ecma/FunctionObjects/15.3.1.1-3': [SKIP], - 'ecma/FunctionObjects/15.3.2.1-3': [SKIP], - 'ecma/FunctionObjects/15.3.5-1': [SKIP], -}], # variant == turbofan_opt - - ['no_i18n == True and mode == debug', { # Tests too slow for no18n debug. 'ecma_3/Statements/regress-302439': [PASS, FAST_VARIANTS], diff --git a/tools/testrunner/local/variants.py b/tools/testrunner/local/variants.py index 5f3df497d9..a17992787c 100644 --- a/tools/testrunner/local/variants.py +++ b/tools/testrunner/local/variants.py @@ -6,8 +6,6 @@ ALL_VARIANT_FLAGS = { "default": [[]], "stress": [["--stress-opt", "--always-opt"]], - "turbofan": [["--turbo"]], - "turbofan_opt": [["--turbo", "--always-opt"]], "noturbofan": [["--no-turbo"]], "fullcode": [["--noopt", "--no-turbo"]], # No optimization means disable all optimizations. OptimizeFunctionOnNextCall @@ -22,7 +20,6 @@ ALL_VARIANT_FLAGS = { FAST_VARIANT_FLAGS = { "default": [[]], "stress": [["--stress-opt"]], - "turbofan": [["--turbo"]], "noturbofan": [["--no-turbo"]], "fullcode": [["--noopt", "--no-turbo"]], # No optimization means disable all optimizations. OptimizeFunctionOnNextCall @@ -33,6 +30,5 @@ FAST_VARIANT_FLAGS = { "wasm_traps": [["--wasm_guard_pages", "--wasm_trap_handler", "--invoke-weak-callbacks"]], } -ALL_VARIANTS = set(["default", "stress", "turbofan", "turbofan_opt", - "noturbofan", "fullcode", "nooptimization", "asm_wasm", - "wasm_traps"]) +ALL_VARIANTS = set(["default", "stress", "noturbofan", "fullcode", + "nooptimization", "asm_wasm", "wasm_traps"])