[Lldb-commits] [lldb] r255040 - Remove the -b option from dotest.py

[Zachary Turner via lldb-commits]

Author: zturner
Date: Tue Dec  8 12:43:16 2015
New Revision: 255040

URL: http://llvm.org/viewvc/llvm-project?rev=255040&view=rev
Log:
Remove the -b option from dotest.py

This removes the blacklist option as part of an effort to remove
unused / unmaintained command line options from the test suite.

Removed:
    lldb/trunk/packages/Python/lldbsuite/test/blacklist.py
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
    lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py

Removed: lldb/trunk/packages/Python/lldbsuite/test/blacklist.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/blacklist.py?rev=255039&view=auto
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/blacklist.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/blacklist.py (removed)
@@ -1,18 +0,0 @@
-"""
-'blacklist' is a Python dictionary, it stores the mapping of a string describing
-either a testclass or a testcase, i.e, testclass.testmethod, to the reason (a
-string) it is blacklisted.
-
-Following is an example which states that test class IntegerTypesExprTestCase
-should be skipped because 'This test class crashed' and the test case
-FoundationTestCase.test_data_type_and_expr_with_dsym should be skipped because
-it is 'Temporarily disabled'.
-
-blacklist = {'IntegerTypesExprTestCase': 'This test class crashed',
-             'FoundationTestCase.test_data_type_and_expr_with_dsym': 'Temporarily disabled'
-             }
-"""
-
-blacklist = {'STLTestCase': '<rdar://problem/8837118> Crashed while running the entire test suite'
-             # To skip this test case: ./dotest.py -b blacklist.py -v -w 2> ~/Developer/Log/lldbtest.log
-             }

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=255040&r1=255039&r2=255040&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/configuration.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/configuration.py Tue Dec  8 12:43:16 2015
@@ -60,13 +60,6 @@ dont_do_dsym_test = False
 dont_do_dwarf_test = False
 dont_do_dwo_test = False
 
-# The blacklist is optional (-b blacklistFile) and allows a central place to skip
-# testclass's and/or testclass.testmethod's.
-blacklist = None
-
-# The dictionary as a result of sourcing blacklistFile.
-blacklistConfig = {}
-
 # The list of categories we said we care about
 categoriesList = None
 # set to true if we are going to use categories for cherry-picking test cases

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=255040&r1=255039&r2=255040&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/dotest.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/dotest.py Tue Dec  8 12:43:16 2015
@@ -300,17 +300,6 @@ def parseOptionsAndInitTestdirs():
               "functionality (-G lldb-mi, --skip-category lldb-mi) instead.")
         sys.exit(1)
 
-    if args.b:
-        if args.b.startswith('-'):
-            usage(parser)
-        blacklistFile = args.b
-        if not os.path.isfile(blacklistFile):
-            print('Blacklist file:', blacklistFile, 'does not exist!')
-            usage(parser)
-        # Now read the blacklist contents and assign it to blacklist.
-        execfile(blacklistFile, globals(), configuration.blacklistConfig)
-        configuration.blacklist = configuration.blacklistConfig.get('blacklist')
-
     if args.c:
         if args.c.startswith('-'):
             usage(parser)

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=255040&r1=255039&r2=255040&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/dotest_args.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/dotest_args.py Tue Dec  8 12:43:16 2015
@@ -60,7 +60,6 @@ def create_parser():
     # Test filtering options
     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('-b', metavar='blacklist', help='Read a blacklist file specified after this option')
     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")

Modified: lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py?rev=255040&r1=255039&r2=255040&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py Tue Dec  8 12:43:16 2015
@@ -2420,18 +2420,6 @@ class TestBase(Base):
         # Works with the test driver to conditionally skip tests via decorators.
         Base.setUp(self)
 
-        try:
-            blacklist = configuration.blacklist
-            if blacklist:
-                className = self.__class__.__name__
-                classAndMethodName = "%s.%s" % (className, self._testMethodName)
-                if className in blacklist:
-                    self.skipTest(blacklist.get(className))
-                elif classAndMethodName in blacklist:
-                    self.skipTest(blacklist.get(classAndMethodName))
-        except AttributeError:
-            pass
-
         # Insert some delay between successive test cases if specified.
         self.doDelay()