Commit bea99787 authored by Michael Achenbach's avatar Michael Achenbach Committed by Commit Bot

[foozzie] Insensitive terms clean-up

No-Try: true
Bug: v8:10619
Change-Id: I1e227c64fa34caf010271b299d9310d19bdfc53a
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2563273
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Reviewed-by: 's avatarMaya Lekova <mslekova@chromium.org>
Reviewed-by: 's avatarClemens Backes <clemensb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#71454}
parent 3b139bf8
......@@ -16,7 +16,7 @@ if (v8_correctness_fuzzer) {
"v8_mock.js",
"v8_mock_archs.js",
"v8_mock_webassembly.js",
"v8_sanity_checks.js",
"v8_smoke_tests.js",
"v8_suppressions.js",
"v8_suppressions.py",
]
......
#
# V8 correctness failure
# V8 correctness configs: x64,ignition:x64,ignition_turbo
# V8 correctness sources: sanity check failed
# V8 correctness sources: smoke test failed
# V8 correctness suppression:
#
# CHECK
......
......@@ -96,10 +96,10 @@ RETURN_PASS = 0
RETURN_FAIL = 2
BASE_PATH = os.path.dirname(os.path.abspath(__file__))
SANITY_CHECKS = os.path.join(BASE_PATH, 'v8_sanity_checks.js')
SMOKE_TESTS = os.path.join(BASE_PATH, 'v8_smoke_tests.js')
# Timeout for one d8 run.
SANITY_CHECK_TIMEOUT_SEC = 1
SMOKE_TEST_TIMEOUT_SEC = 1
TEST_TIMEOUT_SEC = 3
SUPPORTED_ARCHS = ['ia32', 'x64', 'arm', 'arm64']
......@@ -257,8 +257,8 @@ def parse_args():
'--random-seed', type=int, required=True,
help='random seed passed to both runs')
parser.add_argument(
'--skip-sanity-checks', default=False, action='store_true',
help='skip sanity checks for testing purposes')
'--skip-smoke-tests', default=False, action='store_true',
help='skip smoke tests for testing purposes')
parser.add_argument(
'--skip-suppressions', default=False, action='store_true',
help='skip suppressions to reproduce known issues')
......@@ -388,7 +388,7 @@ def run_comparisons(suppress, execution_configs, test_case, timeout,
timeout: Timeout in seconds for one run.
verbose: Prints the executed commands.
ignore_crashes: Typically we ignore crashes during fuzzing as they are
frequent. However, when running sanity checks we should not crash
frequent. However, when running smoke tests we should not crash
and immediately flag crashes as a failure.
source_key: A fixed source key. If not given, it will be inferred from the
output.
......@@ -427,7 +427,7 @@ def run_comparisons(suppress, execution_configs, test_case, timeout,
# detected. This is only for the statistics during experiments.
raise PassException('# V8 correctness - C-R-A-S-H')
else:
# Subsume simulated and unexpected crashes (e.g. during sanity checks)
# Subsume simulated and unexpected crashes (e.g. during smoke tests)
# with one failure state.
crash_state = 'simulated crash' if simulated else 'unexpected crash'
raise FailException(FAILURE_HEADER_TEMPLATE % dict(
......@@ -458,18 +458,18 @@ def main():
# First, run some fixed smoke tests in all configs to ensure nothing
# is fundamentally wrong, in order to prevent bug flooding.
if not options.skip_sanity_checks:
if not options.skip_smoke_tests:
run_comparisons(
suppress, execution_configs,
test_case=SANITY_CHECKS,
timeout=SANITY_CHECK_TIMEOUT_SEC,
test_case=SMOKE_TESTS,
timeout=SMOKE_TEST_TIMEOUT_SEC,
verbose=False,
# Don't accept crashes during sanity checks. A crash would hint at
# Don't accept crashes during smoke tests. A crash would hint at
# a flag that might be incompatible or a broken test file.
ignore_crashes=False,
# Special source key for sanity checks so that clusterfuzz dedupes all
# Special source key for smoke tests so that clusterfuzz dedupes all
# cases on this in case it's hit.
source_key = 'sanity check failed',
source_key = 'smoke test failed',
)
# Second, run all configs against the fuzz test case.
......
......@@ -270,7 +270,7 @@ class SystemTest(unittest.TestCase):
build3: As build1 but with an architecture difference as well.
"""
def testSyntaxErrorDiffPass(self):
stdout = run_foozzie('build1', '--skip-sanity-checks')
stdout = run_foozzie('build1', '--skip-smoke-tests')
self.assertEqual('# V8 correctness - pass\n',
cut_verbose_output(stdout, 3))
# Default comparison includes suppressions.
......@@ -283,7 +283,7 @@ class SystemTest(unittest.TestCase):
with open(os.path.join(TEST_DATA, 'failure_output.txt')) as f:
expected_output = f.read()
with self.assertRaises(subprocess.CalledProcessError) as ctx:
run_foozzie('build2', '--skip-sanity-checks',
run_foozzie('build2', '--skip-smoke-tests',
'--first-config-extra-flags=--flag1',
'--first-config-extra-flags=--flag2=0',
'--second-config-extra-flags=--flag3')
......@@ -291,8 +291,8 @@ class SystemTest(unittest.TestCase):
self.assertEqual(v8_foozzie.RETURN_FAIL, e.returncode)
self.assertEqual(expected_output, cut_verbose_output(e.output, 2))
def testSanityCheck(self):
with open(os.path.join(TEST_DATA, 'sanity_check_output.txt')) as f:
def testSmokeTest(self):
with open(os.path.join(TEST_DATA, 'smoke_test_output.txt')) as f:
expected_output = f.read()
with self.assertRaises(subprocess.CalledProcessError) as ctx:
run_foozzie('build2')
......@@ -305,7 +305,7 @@ class SystemTest(unittest.TestCase):
we use executables with different architectures.
"""
# Build 3 simulates x86, while the baseline is x64.
stdout = run_foozzie('build3', '--skip-sanity-checks')
stdout = run_foozzie('build3', '--skip-smoke-tests')
lines = stdout.split('\n')
# TODO(machenbach): Don't depend on the command-lines being printed in
# particular lines.
......@@ -315,7 +315,7 @@ class SystemTest(unittest.TestCase):
def testJitless(self):
"""Test that webassembly is mocked out when comparing with jitless."""
stdout = run_foozzie(
'build1', '--skip-sanity-checks', second_config='jitless')
'build1', '--skip-smoke-tests', second_config='jitless')
lines = stdout.split('\n')
# TODO(machenbach): Don't depend on the command-lines being printed in
# particular lines.
......@@ -328,14 +328,14 @@ class SystemTest(unittest.TestCase):
"""
# Compare baseline with baseline. This passes as there is no difference.
stdout = run_foozzie(
'baseline', '--skip-sanity-checks', '--skip-suppressions')
'baseline', '--skip-smoke-tests', '--skip-suppressions')
self.assertNotIn('v8_suppressions.js', stdout)
# Compare with a build that usually suppresses a difference. Now we fail
# since we skip suppressions.
with self.assertRaises(subprocess.CalledProcessError) as ctx:
run_foozzie(
'build1', '--skip-sanity-checks', '--skip-suppressions')
'build1', '--skip-smoke-tests', '--skip-suppressions')
e = ctx.exception
self.assertEqual(v8_foozzie.RETURN_FAIL, e.returncode)
self.assertNotIn('v8_suppressions.js', e.output)
......
......@@ -31,7 +31,7 @@ print("https://crbug.com/985154");
print(Object.getOwnPropertyNames(foo().bar));
})();
print("Suppresses sensitive natives");
print("Sensitive runtime functions are neutered");
(function () {
function foo() {}
%PrepareFunctionForOptimization(foo);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment