From c95173b2eb13b3b0c557546db9510f716ce2d1ca Mon Sep 17 00:00:00 2001 From: "machenbach@chromium.org" Date: Tue, 26 Nov 2013 16:53:04 +0000 Subject: [PATCH] Increase test runner speed. Let the test runner preserve the order of test suites to let suites with long running tests run first. Mark some tests as slow that can now be skipped via --slow-tests=skip. BUG= R=yangguo@chromium.org Review URL: https://codereview.chromium.org/88343002 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@18086 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- test/cctest/cctest.status | 14 ++++++++++++++ test/mjsunit/mjsunit.status | 14 +++++++++++++- tools/run-tests.py | 4 ++-- 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/test/cctest/cctest.status b/test/cctest/cctest.status index a596add..e4fe0d8 100644 --- a/test/cctest/cctest.status +++ b/test/cctest/cctest.status @@ -60,6 +60,13 @@ # running several variants. Note that this still takes ages, because there # are actually 13 * 38 * 5 * 128 = 316160 individual tests hidden here. 'test-parsing/ParserSync': [PASS, NO_VARIANTS], + + ############################################################################ + # Slow tests. + 'test-api/Threading1': [PASS, ['mode == debug', SLOW]], + 'test-api/Threading2': [PASS, ['mode == debug', SLOW]], + 'test-api/Threading3': [PASS, ['mode == debug', SLOW]], + 'test-api/Threading4': [PASS, ['mode == debug', SLOW]], }], # ALWAYS ############################################################################## @@ -89,6 +96,13 @@ 'test-serialize/DeserializeFromSecondSerializationAndRunScript2': [SKIP], 'test-serialize/DeserializeAndRunScript2': [SKIP], 'test-serialize/DeserializeFromSecondSerialization': [SKIP], + + ############################################################################ + # Slow tests. + 'test-api/Threading1': [PASS, SLOW], + 'test-api/Threading2': [PASS, SLOW], + 'test-api/Threading3': [PASS, SLOW], + 'test-api/Threading4': [PASS, SLOW], }], # 'arch == arm' ############################################################################## diff --git a/test/mjsunit/mjsunit.status b/test/mjsunit/mjsunit.status index be3ec52..a0b45a0 100644 --- a/test/mjsunit/mjsunit.status +++ b/test/mjsunit/mjsunit.status @@ -33,7 +33,7 @@ ############################################################################## # Flaky tests. # BUG(v8:2921). - 'debug-step-4-in-frame': [PASS, FAIL], + 'debug-step-4-in-frame': [PASS, FAIL, SLOW], ############################################################################## # Fails. @@ -160,6 +160,18 @@ # Currently always deopt on minus zero 'math-floor-of-div-minus-zero': [SKIP], + + ############################################################################ + # Slow tests. + 'regress/regress-2185-2': [PASS, SLOW], + 'mirror-object': [PASS, SLOW], + 'compiler/osr-with-args': [PASS, SLOW], + 'array-sort': [PASS, SLOW], + 'packed-elements': [PASS, SLOW], + 'regress/regress-91008': [PASS, SLOW], + 'regress/regress-2790': [PASS, SLOW], + 'regress/regress-json-stringify-gc': [PASS, SLOW], + 'regress/regress-1122': [PASS, SLOW], }], # 'arch == arm or arch == android_arm' ############################################################################## diff --git a/tools/run-tests.py b/tools/run-tests.py index 32b3f49..79095f6 100755 --- a/tools/run-tests.py +++ b/tools/run-tests.py @@ -293,14 +293,14 @@ def Main(): suite_paths = utils.GetSuitePaths(join(workspace, "test")) if len(args) == 0: - suite_paths = [ s for s in suite_paths if s in DEFAULT_TESTS ] + suite_paths = [ s for s in DEFAULT_TESTS if s in suite_paths ] else: args_suites = set() for arg in args: suite = arg.split(os.path.sep)[0] if not suite in args_suites: args_suites.add(suite) - suite_paths = [ s for s in suite_paths if s in args_suites ] + suite_paths = [ s for s in args_suites if s in suite_paths ] suites = [] for root in suite_paths: -- 2.7.4