[dotest] Remove the -# option

[JDevlieghere]

Summary

Rerunning the test suite is not something that dotest.py should be responsible for. This is another step towards making lit the driver and dotest the test framework.

[jingham]

I use -# for running single tests multiple times. This is useful particularly if you have a test that only fails sometimes, you can do:

$ lldb-dotest -p testname.py -d -#400

then attach lldb to the Python instance set some breakpoints, if that's appropriate and continue. Then when you get the bad path, you're sitting there in the debugger with the failure in front of you. Very convenient. I don't see a way to do this with the lit infrastructure at present.

It seems to me that this is independent of the project of making dotest not be a driver, since this has nothing to do with finding tests, or farming many tests out to multiple processes, it just says "I passed you the test to run but run it 400 times in series rather than one time." So I don't think this is at cross purposes to that project.

Until there's another way to do this task that's as convenient, it would be nice not to remove this option.

[JDevlieghere]

Alright, let's keep it 👍

lldb/packages/Python/lldbsuite/test/configuration.py

 # Categories we want to skip
 skipCategories = ["darwin-log"]
 # use this to track per-category failures
 failuresPerCategory = {}
 
 # The path to LLDB.framework is optional.
 lldbFrameworkPath = None
 
-# Test suite repeat count.  Can be overwritten with '-# count'.
-count = 1
-
 # The 'arch' and 'compiler' can be specified via command line.
 arch = None        # Must be initialized after option parsing
 compiler = None    # Must be initialized after option parsing
 
 # The overriden dwarf verison.
 dwarf_version = 0
 
 # Path to the FileCheck testing tool. Not optional.

lldb/packages/Python/lldbsuite/test/dotest.py

def parseOptionsAndInitTestdirs():
     configuration.session_file_format = args.session_file_format
 
     if args.t:
         os.environ['LLDB_COMMAND_TRACE'] = 'YES'
 
     if args.v:
         configuration.verbose = 2
 
-    # argparse makes sure we have a number
-    if args.sharp:
-        configuration.count = args.sharp
-
     if sys.platform.startswith('win32'):
         os.environ['LLDB_DISABLE_CRASH_DIALOG'] = str(
             args.disable_crash_dialog)
         os.environ['LLDB_LAUNCH_INFERIORS_WITHOUT_CONSOLE'] = str(True)
 
     if do_help:
         usage(parser)
 
def run_suite():
     if configuration.verbose:
         sys.stderr.write(configuration.separator + "\n")
         sys.stderr.write(
             "Collected %d test%s\n\n" %
             (configuration.suite.countTestCases(),
              configuration.suite.countTestCases() != 1 and "s" or ""))
 
     # Invoke the test runner.
-    if configuration.count == 1:
-        result = unittest2.TextTestRunner(
-            stream=sys.stderr,
-            verbosity=configuration.verbose,
-            resultclass=test_result.LLDBTestResult).run(
-            configuration.suite)
-    else:
-        # We are invoking the same test suite more than once.  In this case,
-        # mark __ignore_singleton__ flag as True so the signleton pattern is
-        # not enforced.
-        test_result.LLDBTestResult.__ignore_singleton__ = True
-        for i in range(configuration.count):
-
-            result = unittest2.TextTestRunner(
-                stream=sys.stderr,
-                verbosity=configuration.verbose,
-                resultclass=test_result.LLDBTestResult).run(
-                configuration.suite)
 
     configuration.failed = not result.wasSuccessful()
 
     if configuration.sdir_has_content and configuration.verbose:
         sys.stderr.write(
             "Session logs for test failures/errors/unexpected successes"
             " can be found in directory '%s'\n" %
             configuration.sdir_name)

lldb/packages/Python/lldbsuite/test/dotest_args.py

group.add_argument(
         default=configuration.session_file_format,
         metavar='format',
         help='Specify session file name format.  See configuration.py for a description.')
     group.add_argument(
         '-y',
         type=int,
         metavar='count',
         help="Specify the iteration count used to collect our benchmarks. An example is the number of times to do 'thread step-over' to measure stepping speed.")
-    group.add_argument(
-        '-#',
-        type=int,
-        metavar='sharp',
-        dest='sharp',
-        help='Repeat the test suite for a specified number of times')
     group.add_argument('--channel', metavar='channel', dest='channels', action='append', help=textwrap.dedent(
         "Specify the log channels (and optional categories) e.g. 'lldb all' or 'gdb-remote packets' if no categories are specified, 'default' is used"))
     group.add_argument(
         '--log-success',
         dest='log_success',
         action='store_true',
         help="Leave logs/traces even for successful test runs (useful for creating reference log files during debugging.)")
     group.add_argument(

lldb/packages/Python/lldbsuite/test/test_result.py

class LLDBTestResult(unittest2.TextTestResult):
     Enforce a singleton pattern to allow introspection of test progress.
 
     Overwrite addError(), addFailure(), and addExpectedFailure() methods
     to enable each test instance to track its failure/error status.  It
     is used in the LLDB test framework to emit detailed trace messages
     to a log file for easier human inspection of test failures/errors.
     """
     __singleton__ = None
-    __ignore_singleton__ = False
 
     @staticmethod
     def getTerminalSize():
         import os
         env = os.environ
 
         def ioctl_GWINSZ(fd):
             try:
def getTerminalSize():
                 os.close(fd)
             except:
                 pass
         if not cr:
             cr = (env.get('LINES', 25), env.get('COLUMNS', 80))
         return int(cr[1]), int(cr[0])
 
     def __init__(self, *args):
-        if not LLDBTestResult.__ignore_singleton__ and LLDBTestResult.__singleton__:
-            raise Exception("LLDBTestResult instantiated more than once")
         super(LLDBTestResult, self).__init__(*args)
         LLDBTestResult.__singleton__ = self
         # Now put this singleton into the lldb module namespace.
         configuration.test_result = self
         # Computes the format string for displaying the counter.
         counterWidth = len(str(configuration.suite.countTestCases()))
         self.fmt = "%" + str(counterWidth) + "d: "
         self.indentation = ' ' * (counterWidth + 2)