Commit 2b6d70d3 authored by Kevin Modzelewski's avatar Kevin Modzelewski

Minor tester improvement

parent c41cca4b
...@@ -189,7 +189,9 @@ def get_test_options(fn, check_stats, run_memcheck): ...@@ -189,7 +189,9 @@ def get_test_options(fn, check_stats, run_memcheck):
l = l[len("# run_args:"):].split() l = l[len("# run_args:"):].split()
opts.jit_args += l opts.jit_args += l
elif l.startswith("# expected:"): elif l.startswith("# expected:"):
assert opts.expected == "success", "Multiple 'expected:' lines found!"
opts.expected = l[len("# expected:"):].strip() opts.expected = l[len("# expected:"):].strip()
assert opts.expected != "success", "'expected: success' is the default and is ignored"
elif l.startswith("# should_error"): elif l.startswith("# should_error"):
opts.should_error = True opts.should_error = True
elif l.startswith("# fail-if:"): elif l.startswith("# fail-if:"):
...@@ -258,7 +260,9 @@ def determine_test_result(fn, opts, code, out, stderr, elapsed): ...@@ -258,7 +260,9 @@ def determine_test_result(fn, opts, code, out, stderr, elapsed):
if not have_stats: if not have_stats:
color = 31 color = 31
msg = "no stats available" msg = "no stats available"
if KEEP_GOING: if opts.expected == "fail":
return "Expected failure (no stats found)"
elif KEEP_GOING:
failed.append(fn) failed.append(fn)
if VERBOSE >= 1: if VERBOSE >= 1:
return "\033[%dmFAILED\033[0m (%s)\n%s" % (color, msg, stderr) return "\033[%dmFAILED\033[0m (%s)\n%s" % (color, msg, stderr)
......
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