diff options
author | Pavel Labath <pavel@labath.sk> | 2020-02-13 14:40:09 +0100 |
---|---|---|
committer | Pavel Labath <pavel@labath.sk> | 2020-02-14 10:24:12 +0100 |
commit | 07211d951d584b19951ad8dedbaf7c728297f4b5 (patch) | |
tree | 5d4c15a27491ed62234c68a5d923388633c737ee /lldb/packages/Python/lldbsuite/test | |
parent | 39cb2a8fc79976171b20369ff756f7fa43232b50 (diff) | |
download | llvm-07211d951d584b19951ad8dedbaf7c728297f4b5.zip llvm-07211d951d584b19951ad8dedbaf7c728297f4b5.tar.gz llvm-07211d951d584b19951ad8dedbaf7c728297f4b5.tar.bz2 |
[lldb/dotest] Remove the "exclusive test subdir" concept
Summary:
This was added in 2018 (r339929), when we were still using the
hand-rolled test runner.
It does not seem to be relevant anymore. In fact as far as I can tell,
it's a big no-op now as the exclusive_test_subdir variable is never set.
Reviewers: vsk, JDevlieghere
Subscribers: lldb-commits
Tags: #lldb
Differential Revision: https://reviews.llvm.org/D74551
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test')
-rw-r--r-- | lldb/packages/Python/lldbsuite/test/configuration.py | 36 | ||||
-rw-r--r-- | lldb/packages/Python/lldbsuite/test/dotest.py | 10 |
2 files changed, 1 insertions, 45 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/configuration.py b/lldb/packages/Python/lldbsuite/test/configuration.py index faf31e7d..ce6f46a 100644 --- a/lldb/packages/Python/lldbsuite/test/configuration.py +++ b/lldb/packages/Python/lldbsuite/test/configuration.py @@ -117,11 +117,6 @@ lldb_module_cache_dir = None # The clang module cache directory used by clang. clang_module_cache_dir = None -# The only directory to scan for tests. If multiple test directories are -# specified, and an exclusive test subdirectory is specified, the latter option -# takes precedence. -exclusive_test_subdir = None - # Test results handling globals results_filename = None results_formatter_name = None @@ -153,37 +148,6 @@ def shouldSkipBecauseOfCategories(test_categories): return False -def get_absolute_path_to_exclusive_test_subdir(): - """ - If an exclusive test subdirectory is specified, return its absolute path. - Otherwise return None. - """ - test_directory = os.path.dirname(os.path.realpath(__file__)) - - if not exclusive_test_subdir: - return - - if len(exclusive_test_subdir) > 0: - test_subdir = os.path.join(test_directory, exclusive_test_subdir) - if os.path.isdir(test_subdir): - return test_subdir - - print('specified test subdirectory {} is not a valid directory\n' - .format(test_subdir)) - - -def get_absolute_path_to_root_test_dir(): - """ - If an exclusive test subdirectory is specified, return its absolute path. - Otherwise, return the absolute path of the root test directory. - """ - test_subdir = get_absolute_path_to_exclusive_test_subdir() - if test_subdir: - return test_subdir - - return os.path.dirname(os.path.realpath(__file__)) - - def get_filecheck_path(): """ Get the path to the FileCheck testing tool. diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py index 4863004..5dddc99 100644 --- a/lldb/packages/Python/lldbsuite/test/dotest.py +++ b/lldb/packages/Python/lldbsuite/test/dotest.py @@ -1051,15 +1051,7 @@ def run_suite(): "netbsd" in target_platform or "windows" in target_platform) - # Collect tests from the specified testing directories. If a test - # subdirectory filter is explicitly specified, limit the search to that - # subdirectory. - exclusive_test_subdir = configuration.get_absolute_path_to_exclusive_test_subdir() - if exclusive_test_subdir: - dirs_to_search = [exclusive_test_subdir] - else: - dirs_to_search = configuration.testdirs - for testdir in dirs_to_search: + for testdir in configuration.testdirs: for (dirpath, dirnames, filenames) in os.walk(testdir): visit('Test', dirpath, filenames) |