Author: zturner
Date: Tue Dec 8 12:36:05 2015
New Revision: 255037
URL: http://llvm.org/viewvc/llvm-project?rev=255037&view=rev
Log:
Remove +b option from dotest.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
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=255037&r1=255036&r2=255037&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/configuration.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/configuration.py Tue Dec 8
12:36:05 2015
@@ -56,9 +56,6 @@ def setupCrashInfoHook():
# 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
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=255037&r1=255036&r2=255037&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/dotest.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/dotest.py Tue Dec 8 12:36:05 2015
@@ -300,9 +300,6 @@ def parseOptionsAndInitTestdirs():
"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)
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=255037&r1=255036&r2=255037&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:36:05 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")
- 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')
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=255037&r1=255036&r2=255037&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py Tue Dec 8 12:36:05
2015
@@ -521,8 +521,7 @@ def benchmarks_test(func):
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 @@ class Base(unittest2.TestCase):
# 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
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
