diff options
Diffstat (limited to 'lldb/packages/Python/lldbsuite')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/basic_results_formatter.py | 17 | ||||
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/curses_results.py | 6 | ||||
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/dosep.py | 6 | ||||
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/dotest.py | 10 | ||||
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/result_formatter.py (renamed from lldb/packages/Python/lldbsuite/test/test_results.py) | 0 |
5 files changed, 20 insertions, 19 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/basic_results_formatter.py b/lldb/packages/Python/lldbsuite/test/basic_results_formatter.py index 4a8d0c89686..1f7adc587c2 100644 --- a/lldb/packages/Python/lldbsuite/test/basic_results_formatter.py +++ b/lldb/packages/Python/lldbsuite/test/basic_results_formatter.py @@ -13,10 +13,11 @@ from __future__ import print_function import os # Our imports -from . import test_results +from . import result_formatter import lldbsuite -class BasicResultsFormatter(test_results.ResultsFormatter): + +class BasicResultsFormatter(result_formatter.ResultsFormatter): """Provides basic test result output.""" @classmethod def arg_parser(cls): @@ -240,16 +241,16 @@ class BasicResultsFormatter(test_results.ResultsFormatter): # Output each of the test result entries. categories = [ # result id, printed name, print matching tests?, detail label - [test_results.EventBuilder.STATUS_SUCCESS, + [result_formatter.EventBuilder.STATUS_SUCCESS, "Success", False, None], - [test_results.EventBuilder.STATUS_EXPECTED_FAILURE, + [result_formatter.EventBuilder.STATUS_EXPECTED_FAILURE, "Expected Failure", False, None], - [test_results.EventBuilder.STATUS_FAILURE, + [result_formatter.EventBuilder.STATUS_FAILURE, "Failure", True, "FAIL"], - [test_results.EventBuilder.STATUS_ERROR, "Error", True, "ERROR"], - [test_results.EventBuilder.STATUS_UNEXPECTED_SUCCESS, + [result_formatter.EventBuilder.STATUS_ERROR, "Error", True, "ERROR"], + [result_formatter.EventBuilder.STATUS_UNEXPECTED_SUCCESS, "Unexpected Success", True, "UNEXPECTED SUCCESS"], - [test_results.EventBuilder.STATUS_SKIP, "Skip", False, None]] + [result_formatter.EventBuilder.STATUS_SKIP, "Skip", False, None]] # Partition all the events by test result status result_events_by_status = self._partition_results_by_status( diff --git a/lldb/packages/Python/lldbsuite/test/curses_results.py b/lldb/packages/Python/lldbsuite/test/curses_results.py index a1dee1d8f51..9d480b946ea 100644 --- a/lldb/packages/Python/lldbsuite/test/curses_results.py +++ b/lldb/packages/Python/lldbsuite/test/curses_results.py @@ -23,11 +23,11 @@ import time # LLDB modules from . import lldbcurses -from . import test_results -from .test_results import EventBuilder +from . import result_formatter +from .result_formatter import EventBuilder -class Curses(test_results.ResultsFormatter): +class Curses(result_formatter.ResultsFormatter): """Receives live results from tests that are running and reports them to the terminal in a curses GUI""" def __init__(self, out_file, options): diff --git a/lldb/packages/Python/lldbsuite/test/dosep.py b/lldb/packages/Python/lldbsuite/test/dosep.py index c98136f3634..6b6343c8144 100644 --- a/lldb/packages/Python/lldbsuite/test/dosep.py +++ b/lldb/packages/Python/lldbsuite/test/dosep.py @@ -53,7 +53,7 @@ import lldbsuite.support.seven as seven from . import dotest_channels from . import dotest_args -from . import test_results +from . import result_formatter # Todo: Convert this folder layout to be relative-import friendly and don't hack up # sys.path like this @@ -1429,9 +1429,9 @@ def main(print_details_on_success, num_threads, test_subdir, # Figure out exit code by count of test result types. issue_count = ( results_formatter.counts_by_test_result_status( - test_results.EventBuilder.STATUS_ERROR) + + result_formatter.EventBuilder.STATUS_ERROR) + results_formatter.counts_by_test_result_status( - test_results.EventBuilder.STATUS_FAILURE) + + result_formatter.EventBuilder.STATUS_FAILURE) + timeout_count) # Return with appropriate result code if issue_count > 0: diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py index 94fd9793daf..87f6363b9e7 100644 --- a/lldb/packages/Python/lldbsuite/test/dotest.py +++ b/lldb/packages/Python/lldbsuite/test/dotest.py @@ -43,8 +43,8 @@ import lldbsuite from . import dotest_args from . import lldbtest_config from . import test_categories -from . import test_results -from .test_results import EventBuilder +from . import result_formatter +from .result_formatter import EventBuilder from ..support import seven def is_exe(fpath): @@ -795,7 +795,7 @@ def parseOptionsAndInitTestdirs(): # Tell the event builder to create all events with these # key/val pairs in them. if len(entries) > 0: - test_results.EventBuilder.add_entries_to_all_events(entries) + result_formatter.EventBuilder.add_entries_to_all_events(entries) # Gather all the dirs passed on the command line. if len(args.args) > 0: @@ -930,13 +930,13 @@ def setupTestResults(): else: results_file_object = open(results_filename, "w") cleanup_func = results_file_object.close - default_formatter_name = "lldbsuite.test.test_results.XunitFormatter" + default_formatter_name = "lldbsuite.test.result_formatter.XunitFormatter" elif results_port: # Connect to the specified localhost port. results_file_object, cleanup_func = createSocketToLocalPort( results_port) default_formatter_name = ( - "lldbsuite.test.test_results.RawPickledFormatter") + "lldbsuite.test.result_formatter.RawPickledFormatter") # If we have a results formatter name specified and we didn't specify # a results file, we should use stdout. diff --git a/lldb/packages/Python/lldbsuite/test/test_results.py b/lldb/packages/Python/lldbsuite/test/result_formatter.py index a7961e1cb00..a7961e1cb00 100644 --- a/lldb/packages/Python/lldbsuite/test/test_results.py +++ b/lldb/packages/Python/lldbsuite/test/result_formatter.py |
