Index: tools/run-tests.py |
diff --git a/tools/run-tests.py b/tools/run-tests.py |
index 9525163ae1f33f68e3bb70ac7562e97de1bab861..ef6899f1e5bf4b545aa7ce609631beb70507490f 100755 |
--- a/tools/run-tests.py |
+++ b/tools/run-tests.py |
@@ -226,9 +226,6 @@ def BuildOptions(): |
default=False, action="store_true") |
result.add_option("--cat", help="Print the source of the tests", |
default=False, action="store_true") |
- result.add_option("--flaky-tests", |
- help="Regard tests marked as flaky (run|skip|dontcare)", |
- default="dontcare") |
result.add_option("--slow-tests", |
help="Regard slow tests (run|skip|dontcare)", |
default="dontcare") |
@@ -302,7 +299,7 @@ def BuildOptions(): |
" (verbose, dots, color, mono)"), |
choices=progress.PROGRESS_INDICATORS.keys(), default="mono") |
result.add_option("--quickcheck", default=False, action="store_true", |
- help=("Quick check mode (skip slow/flaky tests)")) |
+ help=("Quick check mode (skip slow tests)")) |
result.add_option("--report", help="Print a summary of the tests to be run", |
default=False, action="store_true") |
result.add_option("--json-test-results", |
@@ -502,7 +499,6 @@ def ProcessOptions(options): |
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: |
@@ -536,8 +532,6 @@ def ProcessOptions(options): |
print "Unknown %s mode %s" % (name, option) |
return False |
return True |
- if not CheckTestMode("flaky test", options.flaky_tests): |
- return False |
if not CheckTestMode("slow test", options.slow_tests): |
return False |
if not CheckTestMode("pass|fail test", options.pass_fail_tests): |
@@ -737,8 +731,8 @@ def Execute(arch, mode, args, options, suites): |
if len(args) > 0: |
s.FilterTestCasesByArgs(args) |
all_tests += s.tests |
- s.FilterTestCasesByStatus(options.warn_unused, options.flaky_tests, |
- options.slow_tests, options.pass_fail_tests) |
+ s.FilterTestCasesByStatus(options.warn_unused, options.slow_tests, |
+ options.pass_fail_tests) |
if options.cat: |
verbose.PrintTestSource(s.tests) |
continue |