diff options
Diffstat (limited to 'lldb/packages/Python/lldbsuite')
-rw-r--r-- | lldb/packages/Python/lldbsuite/__init__.py | 8 | ||||
-rw-r--r-- | lldb/packages/Python/lldbsuite/test/basic_results_formatter.py | 7 |
2 files changed, 10 insertions, 5 deletions
diff --git a/lldb/packages/Python/lldbsuite/__init__.py b/lldb/packages/Python/lldbsuite/__init__.py index fb65606923e..aa6874e78bc 100644 --- a/lldb/packages/Python/lldbsuite/__init__.py +++ b/lldb/packages/Python/lldbsuite/__init__.py @@ -18,3 +18,11 @@ def find_lldb_root(): # lldbsuite.lldb_root refers to the root of the git/svn source checkout lldb_root = find_lldb_root() + +# lldbsuite.lldb_test_root refers to the root of the python test tree +lldb_test_root = os.path.join( + lldb_root, + "packages", + "Python", + "lldbsuite", + "test") diff --git a/lldb/packages/Python/lldbsuite/test/basic_results_formatter.py b/lldb/packages/Python/lldbsuite/test/basic_results_formatter.py index ae4e0c65232..4a8d0c89686 100644 --- a/lldb/packages/Python/lldbsuite/test/basic_results_formatter.py +++ b/lldb/packages/Python/lldbsuite/test/basic_results_formatter.py @@ -13,9 +13,8 @@ from __future__ import print_function import os # Our imports - from . import test_results - +import lldbsuite class BasicResultsFormatter(test_results.ResultsFormatter): """Provides basic test result output.""" @@ -220,14 +219,12 @@ class BasicResultsFormatter(test_results.ResultsFormatter): print_matching_tests = category[2] detail_label = category[3] - test_base_dir = os.path.realpath(os.path.dirname(__file__)) - if print_matching_tests: # Sort by test name for (_, event) in result_events_by_status[result_status_id]: test_relative_path = os.path.relpath( os.path.realpath(event["test_filename"]), - test_base_dir) + lldbsuite.lldb_test_root) self.out_file.write("{}: {} ({})\n".format( detail_label, event["test_name"], |