Allow to combine quickcheck and no_variants in test driver.

BUG=
R=bmeurer@chromium.org

Review URL: https://codereview.chromium.org/489343002

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@23264 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 41d25b79
...@@ -295,10 +295,15 @@ def ProcessOptions(options): ...@@ -295,10 +295,15 @@ def ProcessOptions(options):
return reduce(lambda x, y: x + y, args) <= 1 return reduce(lambda x, y: x + y, args) <= 1
if not excl(options.no_stress, options.stress_only, options.no_variants, if not excl(options.no_stress, options.stress_only, options.no_variants,
bool(options.variants), options.quickcheck): bool(options.variants)):
print("Use only one of --no-stress, --stress-only, --no-variants, " print("Use only one of --no-stress, --stress-only, --no-variants, "
"--variants, or --quickcheck.") "or --variants.")
return False return False
if options.quickcheck:
VARIANTS = ["default", "stress"]
options.flaky_tests = "skip"
options.slow_tests = "skip"
options.pass_fail_tests = "skip"
if options.no_stress: if options.no_stress:
VARIANTS = ["default", "nocrankshaft"] VARIANTS = ["default", "nocrankshaft"]
if options.no_variants: if options.no_variants:
...@@ -310,11 +315,6 @@ def ProcessOptions(options): ...@@ -310,11 +315,6 @@ def ProcessOptions(options):
if not set(VARIANTS).issubset(VARIANT_FLAGS.keys()): if not set(VARIANTS).issubset(VARIANT_FLAGS.keys()):
print "All variants must be in %s" % str(VARIANT_FLAGS.keys()) print "All variants must be in %s" % str(VARIANT_FLAGS.keys())
return False return False
if options.quickcheck:
VARIANTS = ["default", "stress"]
options.flaky_tests = "skip"
options.slow_tests = "skip"
options.pass_fail_tests = "skip"
if options.predictable: if options.predictable:
VARIANTS = ["default"] VARIANTS = ["default"]
options.extra_flags.append("--predictable") options.extra_flags.append("--predictable")
......
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