Skip to content

Commit

Permalink
[lit] Add a --max-failures option.
Browse files Browse the repository at this point in the history
 - This is primarily useful as a "fail fast" mode for lit, where it will stop
   running tests after the first failure.

 - Patch by Max Moiseev.

llvm-svn: 282452
  • Loading branch information
ddunbar committed Sep 26, 2016
1 parent a9f85d6 commit 40b6500
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 3 deletions.
4 changes: 3 additions & 1 deletion llvm/utils/lit/lit/LitConfig.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ def __init__(self, progname, path, quiet,
useValgrind, valgrindLeakCheck, valgrindArgs,
noExecute, debug, isWindows,
params, config_prefix = None,
maxIndividualTestTime = 0):
maxIndividualTestTime = 0,
maxFailures = None):
# The name of the test runner.
self.progname = progname
# The items to add to the PATH environment variable.
Expand Down Expand Up @@ -60,6 +61,7 @@ def __init__(self, progname, path, quiet,
self.valgrindArgs.extend(self.valgrindUserArgs)

self.maxIndividualTestTime = maxIndividualTestTime
self.maxFailures = maxFailures

@property
def maxIndividualTestTime(self):
Expand Down
12 changes: 10 additions & 2 deletions llvm/utils/lit/lit/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,9 @@ def main_with_tmp(builtinParameters):
help="Maximum time to spend running a single test (in seconds)."
"0 means no time limit. [Default: 0]",
type=int, default=None)
group.add_option("", "--max-failures", dest="maxFailures",
help="Stop execution after the given number of failures.",
action="store", type=int, default=None)
parser.add_option_group(group)

group = OptionGroup(parser, "Test Selection")
Expand Down Expand Up @@ -291,6 +294,9 @@ def main_with_tmp(builtinParameters):
else:
opts.numThreads = 1

if opts.maxFailures == 0:
parser.error("Setting --max-failures to 0 does not have any effect.")

inputs = args

# Create the user defined parameters.
Expand Down Expand Up @@ -324,7 +330,8 @@ def main_with_tmp(builtinParameters):
isWindows = isWindows,
params = userParams,
config_prefix = opts.configPrefix,
maxIndividualTestTime = maxIndividualTestTime)
maxIndividualTestTime = maxIndividualTestTime,
maxFailures = opts.maxFailures)

# Perform test discovery.
run = lit.run.Run(litConfig,
Expand Down Expand Up @@ -477,7 +484,8 @@ def main_with_tmp(builtinParameters):
('Expected Failing Tests', lit.Test.XFAIL),
('Timed Out Tests', lit.Test.TIMEOUT)):
if (lit.Test.XFAIL == code and not opts.show_xfail) or \
(lit.Test.UNSUPPORTED == code and not opts.show_unsupported):
(lit.Test.UNSUPPORTED == code and not opts.show_unsupported) or \
(lit.Test.UNRESOLVED == code and (opts.maxFailures is not None)):
continue
elts = byCode.get(code)
if not elts:
Expand Down
14 changes: 14 additions & 0 deletions llvm/utils/lit/lit/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,19 @@ def run_one_tester(run, provider, display):

###

def handleFailures(provider, consumer, maxFailures):
class _Display(object):
def __init__(self, display):
self.display = display
self.maxFailures = maxFailures or object()
self.failedCount = 0
def update(self, test):
self.display.update(test)
self.failedCount += (test.result.code == lit.Test.FAIL)
if self.failedCount == self.maxFailures:
provider.cancel()
consumer.display = _Display(consumer.display)

class Run(object):
"""
This class represents a concrete, configured testing run.
Expand Down Expand Up @@ -232,6 +245,7 @@ def execute_tests(self, display, jobs, max_time=None,

# Create the test provider.
provider = TestProvider(queue_impl, canceled_flag)
handleFailures(provider, consumer, self.lit_config.maxFailures)

# Queue the tests outside the main thread because we can't guarantee
# that we can put() all the tests without blocking:
Expand Down
14 changes: 14 additions & 0 deletions llvm/utils/lit/tests/max-failures.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Check the behavior of --max-failures option.
#
# RUN: not %{lit} -j 1 -v %{inputs}/shtest-shell > %t.out
# RUN: not %{lit} --max-failures=1 -j 1 -v %{inputs}/shtest-shell >> %t.out
# RUN: not %{lit} --max-failures=2 -j 1 -v %{inputs}/shtest-shell >> %t.out
# RUN: not %{lit} --max-failures=0 -j 1 -v %{inputs}/shtest-shell 2>> %t.out
# RUN: FileCheck < %t.out %s
#
# END.

# CHECK: Failing Tests (3)
# CHECK: Failing Tests (1)
# CHECK: Failing Tests (2)
# CHECK: error: Setting --max-failures to 0 does not have any effect.

0 comments on commit 40b6500

Please sign in to comment.