Remove the -g option from dotest.py

This removes the non-exclusive filterspec option as part of an
effort to remove unused / deprecated command line options from
dotest.

llvm-svn: 255041

3 files changed, 1 insertions, 11 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/configuration.py b/lldb/packages/Python/lldbsuite/test/configuration.py
index 17eace71c8f..14557216cf1 100644
--- a/lldb/packages/Python/lldbsuite/test/configuration.py
+++ b/lldb/packages/Python/lldbsuite/test/configuration.py
@@ -120,11 +120,6 @@ filters = []
 # Use '-k' to specify a runhook.
 runHooks = []
 
-# If '-g' is specified, the filterspec is not exclusive.  If a test module does
-# not contain testclass.testmethod which matches the filterspec, the whole test
-# module is still admitted into our test suite.  fs4all flag defaults to True.
-fs4all = True
-
 # Ignore the build search path relative to this script to locate the lldb.py module.
 ignore = False
 
diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py
index 709846d6f07..97b6d119907 100644
--- a/lldb/packages/Python/lldbsuite/test/dotest.py
+++ b/lldb/packages/Python/lldbsuite/test/dotest.py
@@ -339,9 +339,6 @@ def parseOptionsAndInitTestdirs():
         # output-on-success.
         configuration.no_multiprocess_test_runner = True
 
-    if args.g:
-        configuration.fs4all = False
-
     if args.i:
         configuration.ignore = True
 
@@ -915,8 +912,7 @@ def visit(prefix, dir, names):
                     continue
 
             # Forgo this module if the (base, filterspec) combo is invalid
-            # and no '-g' option is specified
-            if configuration.filters and configuration.fs4all and not filtered:
+            if configuration.filters and not filtered:
                 continue
 
             # Add either the filtered test case(s) (which is done before) or the entire test class.
diff --git a/lldb/packages/Python/lldbsuite/test/dotest_args.py b/lldb/packages/Python/lldbsuite/test/dotest_args.py
index 6ecb968cef0..5cfff1915ca 100644
--- a/lldb/packages/Python/lldbsuite/test/dotest_args.py
+++ b/lldb/packages/Python/lldbsuite/test/dotest_args.py
@@ -61,7 +61,6 @@ def create_parser():
     group = parser.add_argument_group('Test filtering options')
     group.add_argument('-N', choices=['dwarf', 'dwo', 'dsym'], help="Don't do test cases marked with the @dsym_test/@dwarf_test/@dwo_test decorator by passing dsym/dwarf/dwo as the option arg")
     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('-g', 'If specified, the filterspec by -f is not exclusive, i.e., if a test module does not match the filterspec (testclass.testmethod), the whole module is still admitted to the test suite')
     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")