Remove +b option from dotest.py
llvm-svn: 255037
diff --git a/lldb/packages/Python/lldbsuite/test/configuration.py b/lldb/packages/Python/lldbsuite/test/configuration.py
index ef91fbb..c66a37b 100644
--- a/lldb/packages/Python/lldbsuite/test/configuration.py
+++ b/lldb/packages/Python/lldbsuite/test/configuration.py
@@ -56,9 +56,6 @@
# The test suite.
suite = unittest2.TestSuite()
-# By default, benchmarks tests are not run.
-just_do_benchmarks_test = False
-
dont_do_dsym_test = False
dont_do_dwarf_test = False
dont_do_dwo_test = False
diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py
index 44256ae..69bc6f1 100644
--- a/lldb/packages/Python/lldbsuite/test/dotest.py
+++ b/lldb/packages/Python/lldbsuite/test/dotest.py
@@ -300,9 +300,6 @@
"functionality (-G lldb-mi, --skip-category lldb-mi) instead.")
sys.exit(1)
- if args.plus_b:
- lldbsuite.test.just_do_benchmarks_test = True
-
if args.b:
if args.b.startswith('-'):
usage(parser)
diff --git a/lldb/packages/Python/lldbsuite/test/dotest_args.py b/lldb/packages/Python/lldbsuite/test/dotest_args.py
index 891a335..b5345b3 100644
--- a/lldb/packages/Python/lldbsuite/test/dotest_args.py
+++ b/lldb/packages/Python/lldbsuite/test/dotest_args.py
@@ -60,7 +60,6 @@
# 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")
- X('+b', 'Just do benchmark tests', dest='plus_b')
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')
diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py
index 4b0fb37..72c9586 100644
--- a/lldb/packages/Python/lldbsuite/test/lldbtest.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py
@@ -521,8 +521,7 @@
raise Exception("@benchmarks_test can only be used to decorate a test method")
@wraps(func)
def wrapper(self, *args, **kwargs):
- if not configuration.just_do_benchmarks_test:
- self.skipTest("benchmarks tests")
+ self.skipTest("benchmarks test")
return func(self, *args, **kwargs)
# Mark this function as such to separate them from the regular tests.
@@ -1457,19 +1456,6 @@
# used for all the test cases.
self.testMethodName = self._testMethodName
- # Benchmarks test is decorated with @benchmarks_test,
- # which also sets the "__benchmarks_test__" attribute of the
- # function object to True.
- try:
- if configuration.just_do_benchmarks_test:
- testMethod = getattr(self, self._testMethodName)
- if getattr(testMethod, "__benchmarks_test__", False):
- pass
- else:
- self.skipTest("non benchmarks test")
- except AttributeError:
- pass
-
# This is for the case of directly spawning 'lldb'/'gdb' and interacting
# with it using pexpect.
self.child = None