diff options
Diffstat (limited to 'lldb/packages/Python/lldbsuite')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/configuration.py | 1 | ||||
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/dosep.py | 19 | ||||
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/dotest.py | 9 | ||||
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/dotest_args.py | 7 |
4 files changed, 5 insertions, 31 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/configuration.py b/lldb/packages/Python/lldbsuite/test/configuration.py index 9591ae3f70e..02f04c74579 100644 --- a/lldb/packages/Python/lldbsuite/test/configuration.py +++ b/lldb/packages/Python/lldbsuite/test/configuration.py @@ -146,7 +146,6 @@ lldb_platform_working_dir = None is_inferior_test_runner = False multiprocess_test_subdir = None num_threads = None -output_on_success = False no_multiprocess_test_runner = False test_runner_name = None diff --git a/lldb/packages/Python/lldbsuite/test/dosep.py b/lldb/packages/Python/lldbsuite/test/dosep.py index f346d7ebfc9..3f7b92e30fd 100644 --- a/lldb/packages/Python/lldbsuite/test/dosep.py +++ b/lldb/packages/Python/lldbsuite/test/dosep.py @@ -72,7 +72,6 @@ test_counter = None total_tests = None test_name_len = None dotest_options = None -output_on_success = False RESULTS_FORMATTER = None RUNNER_PROCESS_ASYNC_MAP = None RESULTS_LISTENER_CHANNEL = None @@ -120,13 +119,8 @@ def report_test_failure(name, command, output): def report_test_pass(name, output): - global output_lock, output_on_success + global output_lock with output_lock: - if not (RESULTS_FORMATTER and RESULTS_FORMATTER.is_using_terminal()): - if output_on_success: - print(file=sys.stderr) - print(output, file=sys.stderr) - print("[%s PASSED]" % name, file=sys.stderr) update_progress(name) @@ -1425,15 +1419,9 @@ def default_test_runner_name(num_threads): return test_runner_name -def main(print_details_on_success, num_threads, test_subdir, - test_runner_name, results_formatter): +def main(num_threads, test_subdir, test_runner_name, results_formatter): """Run dotest.py in inferior mode in parallel. - @param print_details_on_success the parsed value of the output-on-success - command line argument. When True, details of a successful dotest inferior - are printed even when everything succeeds. The normal behavior is to - not print any details when all the inferior tests pass. - @param num_threads the parsed value of the num-threads command line argument. @@ -1460,8 +1448,7 @@ def main(print_details_on_success, num_threads, test_subdir, dotest_argv = sys.argv[1:] - global output_on_success, RESULTS_FORMATTER - output_on_success = print_details_on_success + global RESULTS_FORMATTER RESULTS_FORMATTER = results_formatter # We can't use sys.path[0] to determine the script directory diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py index ded6324649c..684832455fa 100644 --- a/lldb/packages/Python/lldbsuite/test/dotest.py +++ b/lldb/packages/Python/lldbsuite/test/dotest.py @@ -383,7 +383,7 @@ def parseOptionsAndInitTestdirs(): if sys.platform.startswith('win32'): os.environ['LLDB_DISABLE_CRASH_DIALOG'] = str(args.disable_crash_dialog) - os.environ['LLDB_LAUNCH_INFERIORS_WITHOUT_CONSOLE'] = str(args.hide_inferior_console) + os.environ['LLDB_LAUNCH_INFERIORS_WITHOUT_CONSOLE'] = str(True) if do_help == True: usage(parser) @@ -394,10 +394,6 @@ def parseOptionsAndInitTestdirs(): if args.inferior: configuration.is_inferior_test_runner = True - # Turn on output_on_sucess if either explicitly added or -v specified. - if args.output_on_success or args.v: - configuration.output_on_success = True - if args.num_threads: configuration.num_threads = args.num_threads @@ -975,8 +971,7 @@ def run_suite(): # multiprocess test runner here. if isMultiprocessTestRunner(): from . import dosep - dosep.main(configuration.output_on_success, configuration.num_threads, - configuration.multiprocess_test_subdir, + dosep.main(configuration.num_threads, configuration.multiprocess_test_subdir, configuration.test_runner_name, configuration.results_formatter_object) raise Exception("should never get here") elif configuration.is_inferior_test_runner: diff --git a/lldb/packages/Python/lldbsuite/test/dotest_args.py b/lldb/packages/Python/lldbsuite/test/dotest_args.py index 7262dcc26e1..7fc012f5054 100644 --- a/lldb/packages/Python/lldbsuite/test/dotest_args.py +++ b/lldb/packages/Python/lldbsuite/test/dotest_args.py @@ -95,9 +95,7 @@ def create_parser(): group.add_argument('--env', dest='set_env_vars', metavar='variable', action='append', help='Specify an environment variable to set to the given value before running the test cases e.g.: --env CXXFLAGS=-O3 --env DYLD_INSERT_LIBRARIES') X('-v', 'Do verbose mode of unittest framework (print out each test case invocation)') group.add_argument('--enable-crash-dialog', dest='disable_crash_dialog', action='store_false', help='(Windows only) When LLDB crashes, display the Windows crash dialog.') - group.add_argument('--show-inferior-console', dest='hide_inferior_console', action='store_false', help='(Windows only) When launching an inferior, dont hide its console window.') group.set_defaults(disable_crash_dialog=True) - group.set_defaults(hide_inferior_console=True) group = parser.add_argument_group('Parallel execution options') group.add_argument( @@ -110,11 +108,6 @@ def create_parser(): action='store_true', help='skip running the multiprocess test runner') group.add_argument( - '--output-on-success', - action='store_true', - help=('print full output of the dotest.py inferior, ' - 'even when all tests succeed')) - group.add_argument( '--threads', type=int, dest='num_threads', |
