Author: zturner
Date: Tue Dec 8 14:36:22 2015
New Revision: 255048
URL: http://llvm.org/viewvc/llvm-project?rev=255048&view=rev
Log:
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.
Modified:
lldb/trunk/packages/Python/lldbsuite/test/configuration.py
lldb/trunk/packages/Python/lldbsuite/test/dotest.py
lldb/trunk/packages/Python/lldbsuite/test/dotest_args.py
Modified: lldb/trunk/packages/Python/lldbsuite/test/configuration.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/configuration.py?rev=255048&r1=255047&r2=255048&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/configuration.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/configuration.py Tue Dec 8
14:36:22 2015
@@ -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
Modified: lldb/trunk/packages/Python/lldbsuite/test/dotest.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/dotest.py?rev=255048&r1=255047&r2=255048&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/dotest.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/dotest.py Tue Dec 8 14:36:22 2015
@@ -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
Modified: lldb/trunk/packages/Python/lldbsuite/test/dotest_args.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/dotest_args.py?rev=255048&r1=255047&r2=255048&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/dotest_args.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/dotest_args.py Tue Dec 8
14:36:22 2015
@@ -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.'''))
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
