From 5067158381ed143b0c7bb8656f2a215f166cc2f6 Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Tue, 8 Dec 2015 20:36:22 +0000 Subject: [PATCH] Remove the -X option from dotest.py This removes the option to exclude a single directory. This is part of an effort to remove unused options and cleanup the interface to the test suite. llvm-svn: 255048 --- lldb/packages/Python/lldbsuite/test/configuration.py | 3 --- lldb/packages/Python/lldbsuite/test/dotest.py | 9 +++------ lldb/packages/Python/lldbsuite/test/dotest_args.py | 1 - 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/lldb/packages/Python/lldbsuite/test/configuration.py b/lldb/packages/Python/lldbsuite/test/configuration.py index 14557216cf19..2ef0cacc99c4 100644 --- a/lldb/packages/Python/lldbsuite/test/configuration.py +++ b/lldb/packages/Python/lldbsuite/test/configuration.py @@ -107,9 +107,6 @@ bmBreakpointSpec = None # The benchmark iteration count, as specified by the '-y' option. bmIterationCount = -1 -# By default, don't exclude any directories. Use '-X' to add one excluded directory. -excluded = set(['.svn', '.git']) - # By default, failfast is False. Use '-F' to overwrite it. failfast = False diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py index 97b6d1199071..eed901252128 100644 --- a/lldb/packages/Python/lldbsuite/test/dotest.py +++ b/lldb/packages/Python/lldbsuite/test/dotest.py @@ -410,11 +410,6 @@ def parseOptionsAndInitTestdirs(): if args.w: os.environ['LLDB_WAIT_BETWEEN_TEST_CASES'] = 'YES' - if args.X: - if args.X.startswith('-'): - usage(parser) - configuration.excluded.add(args.X) - if args.x: if args.x.startswith('-'): usage(parser) @@ -859,7 +854,9 @@ def setupSysPath(): def visit(prefix, dir, names): """Visitor function for os.path.walk(path, visit, arg).""" - if set(dir.split(os.sep)).intersection(configuration.excluded): + dir_components = set(dir.split(os.sep)) + excluded_components = set(['.svn', '.git']) + if dir_components.intersection(excluded_components): #print("Detected an excluded dir component: %s" % dir) return diff --git a/lldb/packages/Python/lldbsuite/test/dotest_args.py b/lldb/packages/Python/lldbsuite/test/dotest_args.py index 5cfff1915ca0..63857c21fb47 100644 --- a/lldb/packages/Python/lldbsuite/test/dotest_args.py +++ b/lldb/packages/Python/lldbsuite/test/dotest_args.py @@ -63,7 +63,6 @@ def create_parser(): group.add_argument('-f', metavar='filterspec', action='append', help='Specify a filter, which consists of the test class name, a dot, followed by the test method, to only admit such test into the test suite') # FIXME: Example? X('-l', "Don't skip long running tests") group.add_argument('-p', metavar='pattern', help='Specify a regexp filename pattern for inclusion in the test suite') - group.add_argument('-X', metavar='directory', help="Exclude a directory from consideration for test discovery. -X types => if 'types' appear in the pathname components of a potential testfile, it will be ignored") group.add_argument('-G', '--category', metavar='category', action='append', dest='categoriesList', help=textwrap.dedent('''Specify categories of test cases of interest. Can be specified more than once.''')) group.add_argument('--skip-category', metavar='category', action='append', dest='skipCategories', help=textwrap.dedent('''Specify categories of test cases to skip. Takes precedence over -G. Can be specified more than once.'''))