From e0a761042dd7fd1500a37f1d38d434fd50aa819e Mon Sep 17 00:00:00 2001 From: Michael Achenbach Date: Thu, 1 Feb 2018 19:02:01 +0100 Subject: [PATCH] [test] Blacklist more flags not suitable for endurance fuzzer TBR=ulan@chromium.org Bug: v8:6972 Change-Id: Ibc8405184828337f9a102cbde437c69ec9542816 Reviewed-on: https://chromium-review.googlesource.com/897366 Reviewed-by: Michael Achenbach Commit-Queue: Michael Achenbach Cr-Commit-Position: refs/heads/master@{#51046} --- test/mjsunit/testcfg.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/test/mjsunit/testcfg.py b/test/mjsunit/testcfg.py index b25c67edff..a084cdc1f3 100644 --- a/test/mjsunit/testcfg.py +++ b/test/mjsunit/testcfg.py @@ -41,11 +41,16 @@ SELF_SCRIPT_PATTERN = re.compile(r"//\s+Env: TEST_FILE_NAME") MODULE_PATTERN = re.compile(r"^// MODULE$", flags=re.MULTILINE) NO_HARNESS_PATTERN = re.compile(r"^// NO HARNESS$", flags=re.MULTILINE) -# Flags known to misbehave when combining arbitrary mjsunit tests. +# Flags known to misbehave when combining arbitrary mjsunit tests. Can also +# be compiled regular expressions. COMBINE_TESTS_FLAGS_BLACKLIST = [ '--check-handle-count', + '--enable-tracing', + re.compile('--experimental.*'), + '--expose-trigger-failure', '--mock-arraybuffer-allocator', '--print-ast', + re.compile('--trace.*'), '--wasm-lazy-compilation', ] @@ -233,6 +238,14 @@ class CombinedTest(testcase.TestCase): elif flag1.startswith('-'): yield flag1 + def _is_flag_blacklisted(self, flag): + for item in COMBINE_TESTS_FLAGS_BLACKLIST: + if isinstance(item, basestring): + if item == flag: + return True + elif item.match(flag): + return True + return False def _get_combined_flags(self, flags_gen): """Combines all flags - dedupes, keeps order and filters some flags. @@ -245,7 +258,7 @@ class CombinedTest(testcase.TestCase): unique_flags = OrderedDict((flag, True) for flag in merged_flags).keys() return [ flag for flag in unique_flags - if flag not in COMBINE_TESTS_FLAGS_BLACKLIST + if not self._is_flag_blacklisted(flag) ] def _get_source_flags(self):