[Lldb-commits] [lldb] r251400 - Deprecate -m/+m dotest options in favor of test categories

Pavel Labath via lldb-commits lldb-commits at lists.llvm.org
Tue Oct 27 02:34:35 PDT 2015


Author: labath
Date: Tue Oct 27 04:34:34 2015
New Revision: 251400

URL: http://llvm.org/viewvc/llvm-project?rev=251400&view=rev
Log:
Deprecate -m/+m dotest options in favor of test categories

Summary:
This change deprecates -m/+m dotest options (the options are still recognized but they print an
error message pointing to the new options) and adds a new lldb-mi test category instead. To just
run lldb-mi tests, use '-G lldb-mi'. To skip lldb-mi tests, use '--skip-category lldb-mi'. All
lldb-mi tests are marked as such using the getCategories method on the base MiTestCaseBase class
and the @lldbmi_test decorator is not needed. In case one still needs to annotate a specific test
function as an lldb-mi test, one can use the @add_test_categories(['lldb-mi']) decorator to
achieve that.

Reviewers: tfiala, dawn, ki.stfu, abidh

Subscribers: lldb-commits

Differential Revision: http://reviews.llvm.org/D14060

Modified:
    lldb/trunk/test/dotest.py
    lldb/trunk/test/dotest_args.py
    lldb/trunk/test/lldbtest.py
    lldb/trunk/test/test_categories.py
    lldb/trunk/test/tools/lldb-mi/TestMiExit.py
    lldb/trunk/test/tools/lldb-mi/TestMiFile.py
    lldb/trunk/test/tools/lldb-mi/TestMiGdbSetShow.py
    lldb/trunk/test/tools/lldb-mi/TestMiLibraryLoaded.py
    lldb/trunk/test/tools/lldb-mi/TestMiPrompt.py
    lldb/trunk/test/tools/lldb-mi/breakpoint/TestMiBreak.py
    lldb/trunk/test/tools/lldb-mi/control/TestMiExec.py
    lldb/trunk/test/tools/lldb-mi/data/TestMiData.py
    lldb/trunk/test/tools/lldb-mi/interpreter/TestMiCliSupport.py
    lldb/trunk/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py
    lldb/trunk/test/tools/lldb-mi/lldbmi_testcase.py
    lldb/trunk/test/tools/lldb-mi/signal/TestMiSignal.py
    lldb/trunk/test/tools/lldb-mi/stack/TestMiStack.py
    lldb/trunk/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py
    lldb/trunk/test/tools/lldb-mi/symbol/TestMiSymbol.py
    lldb/trunk/test/tools/lldb-mi/syntax/TestMiSyntax.py
    lldb/trunk/test/tools/lldb-mi/target/TestMiTarget.py
    lldb/trunk/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py
    lldb/trunk/test/tools/lldb-mi/variable/TestMiVar.py

Modified: lldb/trunk/test/dotest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/dotest.py?rev=251400&r1=251399&r2=251400&view=diff
==============================================================================
--- lldb/trunk/test/dotest.py (original)
+++ lldb/trunk/test/dotest.py Tue Oct 27 04:34:34 2015
@@ -84,12 +84,6 @@ class _WritelnDecorator(object):
 # The test suite.
 suite = unittest2.TestSuite()
 
-# By default, lldb-mi tests are performed if lldb-mi can be found.
-# Use @lldbmi_test decorator, defined in lldbtest.py, to mark a test as
-# a lldb-mi test.
-dont_do_lldbmi_test = False
-just_do_lldbmi_test = False
-
 # By default, benchmarks tests are not run.
 just_do_benchmarks_test = False
 
@@ -414,14 +408,25 @@ def setupCrashInfoHook():
     else:
         pass
 
+def shouldSkipBecauseOfCategories(test_categories):
+    global useCategories, categoriesList, skipCategories
+
+    if useCategories:
+        if len(test_categories) == 0 or len(categoriesList & set(test_categories)) == 0:
+            return True
+
+    for category in skipCategories:
+        if category in test_categories:
+            return True
+
+    return False
+
 def parseOptionsAndInitTestdirs():
     """Initialize the list of directories containing our unittest scripts.
 
     '-h/--help as the first option prints out usage info and exit the program.
     """
 
-    global dont_do_lldbmi_test
-    global just_do_lldbmi_test
     global just_do_benchmarks_test
     global dont_do_dsym_test
     global dont_do_dwarf_test
@@ -566,6 +571,11 @@ def parseOptionsAndInitTestdirs():
               "functionality (-G pyapi, --skip-category pyapi) instead.")
         sys.exit(1)
 
+    if args.m or args.plus_m:
+        print("Options '-m' and '+m' have been deprecated. Please use the test category\n"
+              "functionality (-G lldb-mi, --skip-category lldb-mi) instead.")
+        sys.exit(1)
+
     if args.plus_b:
         just_do_benchmarks_test = True
 
@@ -631,15 +641,6 @@ def parseOptionsAndInitTestdirs():
     if args.l:
         skip_long_running_test = False
 
-    if args.m:
-        dont_do_lldbmi_test = True
-
-    if args.plus_m:
-        if dont_do_lldbmi_test:
-            print("Warning: -m and +m can't both be specified! Using only -m")
-        else:
-            just_do_lldbmi_test = True
-
     if args.framework:
         lldbFrameworkPath = args.framework
 
@@ -727,10 +728,6 @@ def parseOptionsAndInitTestdirs():
     if do_help == True:
         usage(parser)
 
-    # Do not specify both '-m' and '+m' at the same time.
-    if dont_do_lldbmi_test and just_do_lldbmi_test:
-        usage(parser)
-
     if args.no_multiprocess:
         no_multiprocess_test_runner = True
 
@@ -1071,8 +1068,6 @@ def setupSysPath():
     # Some of the tests can invoke the 'lldb' command directly.
     # We'll try to locate the appropriate executable right here.
 
-    lldbMiExec = None
-
     # The lldb executable can be set from the command line
     # if it's not set, we try to find it now
     # first, we try the environment
@@ -1113,15 +1108,13 @@ def setupSysPath():
 
     # Assume lldb-mi is in same place as lldb
     # If not found, disable the lldb-mi tests
-    global dont_do_lldbmi_test
+    lldbMiExec = None
     if lldbtest_config.lldbExec and is_exe(lldbtest_config.lldbExec + "-mi"):
         lldbMiExec = lldbtest_config.lldbExec + "-mi"
     if not lldbMiExec:
-        dont_do_lldbmi_test = True
-        if just_do_lldbmi_test:
+        if not shouldSkipBecauseOfCategories(["lldb-mi"]):
             print("The 'lldb-mi' executable cannot be located.  The lldb-mi tests can not be run as a result.")
-        else:
-            print("The 'lldb-mi' executable cannot be located.  Some of the tests may not be run as a result.")
+            skipCategories.append("lldb-mi")
     else:
         os.environ["LLDBMI_EXEC"] = lldbMiExec
 
@@ -1517,8 +1510,6 @@ if __name__ == "__main__":
     lldb.lldbtest_remote_shell_template = lldbtest_remote_shell_template
 
     # Put all these test decorators in the lldb namespace.
-    lldb.dont_do_lldbmi_test = dont_do_lldbmi_test
-    lldb.just_do_lldbmi_test = just_do_lldbmi_test
     lldb.just_do_benchmarks_test = just_do_benchmarks_test
     lldb.dont_do_dsym_test = dont_do_dsym_test
     lldb.dont_do_dwarf_test = dont_do_dwarf_test
@@ -1807,22 +1798,6 @@ if __name__ == "__main__":
                         test_categories = []
                     return test_categories
 
-                def shouldSkipBecauseOfCategories(self,test):
-                    global useCategories
-                    import inspect
-                    if useCategories:
-                        global categoriesList
-                        test_categories = self.getCategoriesForTest(test)
-                        if len(test_categories) == 0 or len(categoriesList & set(test_categories)) == 0:
-                            return True
-
-                    global skipCategories
-                    for category in skipCategories:
-                        if category in self.getCategoriesForTest(test):
-                            return True
-
-                    return False
-
                 def hardMarkAsSkipped(self,test):
                     getattr(test, test._testMethodName).__func__.__unittest_skip__ = True
                     getattr(test, test._testMethodName).__func__.__unittest_skip_why__ = "test case does not fall in any category of interest for this run"
@@ -1830,7 +1805,7 @@ if __name__ == "__main__":
                     test.__class__.__unittest_skip_why__ = "test case does not fall in any category of interest for this run"
 
                 def startTest(self, test):
-                    if self.shouldSkipBecauseOfCategories(test):
+                    if shouldSkipBecauseOfCategories(self.getCategoriesForTest(test)):
                         self.hardMarkAsSkipped(test)
                     global setCrashInfoHook
                     setCrashInfoHook("%s at %s" % (str(test),inspect.getfile(test.__class__)))

Modified: lldb/trunk/test/dotest_args.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/dotest_args.py?rev=251400&r1=251399&r2=251400&view=diff
==============================================================================
--- lldb/trunk/test/dotest_args.py (original)
+++ lldb/trunk/test/dotest_args.py Tue Oct 27 04:34:34 2015
@@ -60,8 +60,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('-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")
-    X('-m', "Don't do lldb-mi tests")
-    X('+m', "Just do lldb-mi tests. Do not specify along with '-m'", dest='plus_m')
     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.'''))
@@ -186,6 +184,8 @@ def create_parser():
     # Deprecated on 23.10.2015. Remove completely after a grace period.
     D('-a')
     D('+a', dest='plus_a')
+    D('-m')
+    D('+m', dest='plus_m')
     del D
 
     group = parser.add_argument_group('Test directories')

Modified: lldb/trunk/test/lldbtest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lldbtest.py?rev=251400&r1=251399&r2=251400&view=diff
==============================================================================
--- lldb/trunk/test/lldbtest.py (original)
+++ lldb/trunk/test/lldbtest.py Tue Oct 27 04:34:34 2015
@@ -481,20 +481,6 @@ def add_test_categories(cat):
         return func
     return impl
 
-def lldbmi_test(func):
-    """Decorate the item as a lldb-mi only test."""
-    if isinstance(func, type) and issubclass(func, unittest2.TestCase):
-        raise Exception("@lldbmi_test can only be used to decorate a test method")
-    @wraps(func)
-    def wrapper(self, *args, **kwargs):
-        if lldb.dont_do_lldbmi_test:
-            self.skipTest("lldb-mi tests")
-        return func(self, *args, **kwargs)
-
-    # Mark this function as such to separate them from lldb command line tests.
-    wrapper.__lldbmi_test__ = True
-    return wrapper
-
 def benchmarks_test(func):
     """Decorate the item as a benchmarks test."""
     if isinstance(func, type) and issubclass(func, unittest2.TestCase):
@@ -1367,7 +1353,6 @@ class Base(unittest2.TestCase):
             self.lldbMiExec = os.environ["LLDBMI_EXEC"]
         else:
             self.lldbMiExec = None
-            self.dont_do_lldbmi_test = True
 
         # If we spawn an lldb process for test (via pexpect), do not load the
         # init file unless told otherwise.
@@ -1384,19 +1369,6 @@ class Base(unittest2.TestCase):
         # used for all the test cases.
         self.testMethodName = self._testMethodName
 
-        # lldb-mi only test is decorated with @lldbmi_test,
-        # which also sets the "__lldbmi_test__" attribute of the
-        # function object to True.
-        try:
-            if lldb.just_do_lldbmi_test:
-                testMethod = getattr(self, self._testMethodName)
-                if getattr(testMethod, "__lldbmi_test__", False):
-                    pass
-                else:
-                    self.skipTest("non lldb-mi test")
-        except AttributeError:
-            pass
-
         # Benchmarks test is decorated with @benchmarks_test,
         # which also sets the "__benchmarks_test__" attribute of the
         # function object to True.

Modified: lldb/trunk/test/test_categories.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/test_categories.py?rev=251400&r1=251399&r2=251400&view=diff
==============================================================================
--- lldb/trunk/test/test_categories.py (original)
+++ lldb/trunk/test/test_categories.py Tue Oct 27 04:34:34 2015
@@ -13,7 +13,8 @@ all_categories = {
     'cmdline'       : 'Tests related to the LLDB command-line interface',
     'dyntype'       : 'Tests related to dynamic type support',
     'stresstest'    : 'Tests related to stressing lldb limits',
-    'flakey'        : 'Flakey test cases, i.e. tests that do not reliably pass at each execution'
+    'flakey'        : 'Flakey test cases, i.e. tests that do not reliably pass at each execution',
+    'lldb-mi'       : 'lldb-mi tests'
 }
 
 def unique_string_match(yourentry, list):

Modified: lldb/trunk/test/tools/lldb-mi/TestMiExit.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/tools/lldb-mi/TestMiExit.py?rev=251400&r1=251399&r2=251400&view=diff
==============================================================================
--- lldb/trunk/test/tools/lldb-mi/TestMiExit.py (original)
+++ lldb/trunk/test/tools/lldb-mi/TestMiExit.py Tue Oct 27 04:34:34 2015
@@ -13,7 +13,6 @@ class MiExitTestCase(lldbmi_testcase.MiT
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @lldbmi_test
     @expectedFailureWindows("llvm.org/pr22274: need a pexpect replacement for windows")
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_gdb_exit(self):
@@ -38,7 +37,6 @@ class MiExitTestCase(lldbmi_testcase.MiT
         import pexpect
         self.expect(pexpect.EOF)
 
-    @lldbmi_test
     @expectedFailureWindows("llvm.org/pr22274: need a pexpect replacement for windows")
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_quit(self):
@@ -62,7 +60,6 @@ class MiExitTestCase(lldbmi_testcase.MiT
         import pexpect
         self.expect(pexpect.EOF)
 
-    @lldbmi_test
     @expectedFailureWindows("llvm.org/pr22274: need a pexpect replacement for windows")
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_q(self):

Modified: lldb/trunk/test/tools/lldb-mi/TestMiFile.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/tools/lldb-mi/TestMiFile.py?rev=251400&r1=251399&r2=251400&view=diff
==============================================================================
--- lldb/trunk/test/tools/lldb-mi/TestMiFile.py (original)
+++ lldb/trunk/test/tools/lldb-mi/TestMiFile.py Tue Oct 27 04:34:34 2015
@@ -13,7 +13,6 @@ class MiFileTestCase(lldbmi_testcase.MiT
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_file_exec_and_symbols_file(self):
@@ -30,7 +29,6 @@ class MiFileTestCase(lldbmi_testcase.MiT
         self.expect("\^running")
         self.expect("\*stopped,reason=\"exited-normally\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_file_exec_and_symbols_absolute_path(self):
@@ -49,7 +47,6 @@ class MiFileTestCase(lldbmi_testcase.MiT
         self.expect("\^running")
         self.expect("\*stopped,reason=\"exited-normally\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_file_exec_and_symbols_relative_path(self):
@@ -67,7 +64,6 @@ class MiFileTestCase(lldbmi_testcase.MiT
         self.expect("\^running")
         self.expect("\*stopped,reason=\"exited-normally\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_file_exec_and_symbols_unknown_path(self):

Modified: lldb/trunk/test/tools/lldb-mi/TestMiGdbSetShow.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/tools/lldb-mi/TestMiGdbSetShow.py?rev=251400&r1=251399&r2=251400&view=diff
==============================================================================
--- lldb/trunk/test/tools/lldb-mi/TestMiGdbSetShow.py (original)
+++ lldb/trunk/test/tools/lldb-mi/TestMiGdbSetShow.py Tue Oct 27 04:34:34 2015
@@ -14,7 +14,6 @@ class MiGdbSetShowTestCase(lldbmi_testca
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @lldbmi_test
     @expectedFailureWindows("llvm.org/pr22274: need a pexpect replacement for windows")
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_gdb_set_target_async_default(self):
@@ -34,7 +33,6 @@ class MiGdbSetShowTestCase(lldbmi_testca
         self.runCmd("-gdb-show target-async")
         self.expect("\^done,value=\"on\"")
 
-    @lldbmi_test
     @expectedFailureWindows("llvm.org/pr22274: need a pexpect replacement for windows")
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_gdb_set_target_async_on(self):
@@ -63,7 +61,6 @@ class MiGdbSetShowTestCase(lldbmi_testca
         self.expect("\*running")
         self.expect("@\"argc=1")
 
-    @lldbmi_test
     @expectedFailureWindows("llvm.org/pr22274: need a pexpect replacement for windows")
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @expectedFailureLinux # Failing in ~11/600 dosep runs (build 3120-3122)
@@ -89,7 +86,6 @@ class MiGdbSetShowTestCase(lldbmi_testca
         if it < len(unexpected):
             self.fail("unexpected found: %s" % unexpected[it])
 
-    @lldbmi_test
     @expectedFailureWindows("llvm.org/pr22274: need a pexpect replacement for windows")
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_gdb_show_target_async(self):
@@ -101,7 +97,6 @@ class MiGdbSetShowTestCase(lldbmi_testca
         self.runCmd("-gdb-show target-async")
         self.expect("\^done,value=\"on\"")
 
-    @lldbmi_test
     @expectedFailureWindows("llvm.org/pr22274: need a pexpect replacement for windows")
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_gdb_show_language(self):
@@ -124,7 +119,6 @@ class MiGdbSetShowTestCase(lldbmi_testca
         self.runCmd("-gdb-show language")
         self.expect("\^done,value=\"c\+\+\"")
 
-    @lldbmi_test
     @expectedFailureWindows("llvm.org/pr22274: need a pexpect replacement for windows")
     @unittest2.expectedFailure("-gdb-set ignores unknown properties")
     def test_lldbmi_gdb_set_unknown(self):
@@ -136,7 +130,6 @@ class MiGdbSetShowTestCase(lldbmi_testca
         self.runCmd("-gdb-set unknown some_value")
         self.expect("\^error")
 
-    @lldbmi_test
     @expectedFailureWindows("llvm.org/pr22274: need a pexpect replacement for windows")
     @unittest2.expectedFailure("-gdb-show ignores unknown properties")
     def test_lldbmi_gdb_show_unknown(self):
@@ -149,7 +142,6 @@ class MiGdbSetShowTestCase(lldbmi_testca
         self.expect("\^error")
 
 
-    @lldbmi_test
     @expectedFailureWindows("llvm.org/pr22274: need a pexpect replacement for windows")
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @skipIfLinux # llvm.org/pr22841: lldb-mi tests fail on all Linux buildbots

Modified: lldb/trunk/test/tools/lldb-mi/TestMiLibraryLoaded.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/tools/lldb-mi/TestMiLibraryLoaded.py?rev=251400&r1=251399&r2=251400&view=diff
==============================================================================
--- lldb/trunk/test/tools/lldb-mi/TestMiLibraryLoaded.py (original)
+++ lldb/trunk/test/tools/lldb-mi/TestMiLibraryLoaded.py Tue Oct 27 04:34:34 2015
@@ -13,7 +13,6 @@ class MiLibraryLoadedTestCase(lldbmi_tes
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_library_loaded(self):

Modified: lldb/trunk/test/tools/lldb-mi/TestMiPrompt.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/tools/lldb-mi/TestMiPrompt.py?rev=251400&r1=251399&r2=251400&view=diff
==============================================================================
--- lldb/trunk/test/tools/lldb-mi/TestMiPrompt.py (original)
+++ lldb/trunk/test/tools/lldb-mi/TestMiPrompt.py Tue Oct 27 04:34:34 2015
@@ -13,7 +13,6 @@ class MiPromptTestCase(lldbmi_testcase.M
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_prompt(self):

Modified: lldb/trunk/test/tools/lldb-mi/breakpoint/TestMiBreak.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/tools/lldb-mi/breakpoint/TestMiBreak.py?rev=251400&r1=251399&r2=251400&view=diff
==============================================================================
--- lldb/trunk/test/tools/lldb-mi/breakpoint/TestMiBreak.py (original)
+++ lldb/trunk/test/tools/lldb-mi/breakpoint/TestMiBreak.py Tue Oct 27 04:34:34 2015
@@ -14,7 +14,6 @@ class MiBreakTestCase(lldbmi_testcase.Mi
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @expectedFailureAll("llvm.org/pr24717", oslist=["linux"])
@@ -39,7 +38,6 @@ class MiBreakTestCase(lldbmi_testcase.Mi
         self.expect("=breakpoint-modified,bkpt={number=\"1\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"(?!0xffffffffffffffff)0x[0-9a-f]+\",func=\".+?\",file=\".+?\",fullname=\".+?\",line=\"(-1|\d+)\",pending=\[\"printf\"\],times=\"0\",original-location=\"printf\"}")
         self.expect("\*stopped,reason=\"breakpoint-hit\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_break_insert_function(self):
@@ -101,7 +99,6 @@ class MiBreakTestCase(lldbmi_testcase.Mi
         #self.runCmd("-break-insert main.cpp:::main")
         #self.expect("\^done,bkpt={number=\"8\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_break_insert_file_line_pending(self):
@@ -123,7 +120,6 @@ class MiBreakTestCase(lldbmi_testcase.Mi
         self.expect("\^running")
         self.expect("\*stopped,reason=\"breakpoint-hit\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_break_insert_file_line(self):
@@ -156,7 +152,6 @@ class MiBreakTestCase(lldbmi_testcase.Mi
         self.expect("\^running")
         self.expect("\*stopped,reason=\"breakpoint-hit\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @unittest2.expectedFailure("-break-insert doesn't work for absolute path")
@@ -185,7 +180,6 @@ class MiBreakTestCase(lldbmi_testcase.Mi
         self.expect("\^running")
         self.expect("\*stopped,reason=\"breakpoint-hit\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_break_insert_settings(self):

Modified: lldb/trunk/test/tools/lldb-mi/control/TestMiExec.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/tools/lldb-mi/control/TestMiExec.py?rev=251400&r1=251399&r2=251400&view=diff
==============================================================================
--- lldb/trunk/test/tools/lldb-mi/control/TestMiExec.py (original)
+++ lldb/trunk/test/tools/lldb-mi/control/TestMiExec.py Tue Oct 27 04:34:34 2015
@@ -13,7 +13,6 @@ class MiExecTestCase(lldbmi_testcase.MiT
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @expectedFailureLinux # llvm.org/pr25000: lldb-mi does not receive broadcasted notification from Core/Process about process stopped
@@ -33,7 +32,6 @@ class MiExecTestCase(lldbmi_testcase.MiT
         # Test that lldb-mi is ready to execute next commands
         self.expect(self.child_prompt, exactly = True)
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @expectedFailureAll("llvm.org/pr23139", oslist=["linux"], compiler="gcc", compiler_version=[">=","4.9"], archs=["i386"])
@@ -84,7 +82,6 @@ class MiExecTestCase(lldbmi_testcase.MiT
         self.expect("\^done")
         self.expect("\*stopped,reason=\"exited-normally\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @expectedFailureAll("llvm.org/pr23139", oslist=["linux"], compiler="gcc", compiler_version=[">=","4.9"], archs=["i386"])
@@ -128,7 +125,6 @@ class MiExecTestCase(lldbmi_testcase.MiT
         self.runCmd("-interpreter-exec command \"print argv[4]\"")
         self.expect("\"fourth=\\\\\\\"4th arg\\\\\\\"\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @expectedFailureAll("llvm.org/pr23139", oslist=["linux"], compiler="gcc", compiler_version=[">=","4.9"], archs=["i386"])
@@ -158,7 +154,6 @@ class MiExecTestCase(lldbmi_testcase.MiT
         self.runCmd("-data-evaluate-expression argc")
         self.expect("\^done,value=\"1\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_exec_next(self):
@@ -210,7 +205,6 @@ class MiExecTestCase(lldbmi_testcase.MiT
         self.runCmd("-exec-next --frame 10")
         #self.expect("\^error: Frame index 10 is out of range")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @expectedFailurei386 #xfail to get buildbot green, failing config: i386 binary running on ubuntu 14.04 x86_64
@@ -266,7 +260,6 @@ class MiExecTestCase(lldbmi_testcase.MiT
         self.runCmd("-exec-next-instruction --frame 10")
         #self.expect("\^error: Frame index 10 is out of range")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_exec_step(self):
@@ -335,7 +328,6 @@ class MiExecTestCase(lldbmi_testcase.MiT
         self.runCmd("-exec-step --frame 10")
         #self.expect("\^error: Frame index 10 is out of range")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_exec_step_instruction(self):
@@ -397,7 +389,6 @@ class MiExecTestCase(lldbmi_testcase.MiT
         self.runCmd("-exec-step-instruction --frame 10")
         #self.expect("\^error: Frame index 10 is out of range")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @expectedFailureAll("llvm.org/pr23139", oslist=["linux"], compiler="gcc", compiler_version=[">=","4.9"], archs=["i386"])

Modified: lldb/trunk/test/tools/lldb-mi/data/TestMiData.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/tools/lldb-mi/data/TestMiData.py?rev=251400&r1=251399&r2=251400&view=diff
==============================================================================
--- lldb/trunk/test/tools/lldb-mi/data/TestMiData.py (original)
+++ lldb/trunk/test/tools/lldb-mi/data/TestMiData.py Tue Oct 27 04:34:34 2015
@@ -14,7 +14,6 @@ class MiDataTestCase(lldbmi_testcase.MiT
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_data_disassemble(self):
@@ -65,7 +64,6 @@ class MiDataTestCase(lldbmi_testcase.MiT
         self.expect([ "{address=\"0x[0-9a-f]+\",func-name=\"hello_world\(\)\",offset=\"[0-9]+\",size=\"[0-9]+\",inst=\".+?; \\\\\"Hello, World!\\\\\\\\n\\\\\"\"}",
                       "{address=\"0x[0-9a-f]+\",func-name=\"hello_world\(\)\",offset=\"[0-9]+\",size=\"[0-9]+\",inst=\".+?; symbol stub for: printf\"}" ])
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @unittest2.skip("-data-evaluate-expression doesn't work on globals") #FIXME: the global case worked before refactoring
@@ -105,7 +103,6 @@ class MiDataTestCase(lldbmi_testcase.MiT
         self.runCmd("-data-read-memory-bytes %#x %d" % (addr, size))
         self.expect("\^done,memory=\[{begin=\"0x0*%x\",offset=\"0x0+\",end=\"0x0*%x\",contents=\"1112131400\"}\]" % (addr, addr + size))
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_data_read_memory_bytes_local(self):
@@ -215,7 +212,6 @@ class MiDataTestCase(lldbmi_testcase.MiT
         self.runCmd('-data-read-memory-bytes --thread 1 &array')
         self.expect(r'\^error')
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_data_list_register_names(self):
@@ -242,7 +238,6 @@ class MiDataTestCase(lldbmi_testcase.MiT
         self.runCmd("-data-list-register-names 0")
         self.expect("\^done,register-names=\[\".+?\"\]")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_data_list_register_values(self):
@@ -269,7 +264,6 @@ class MiDataTestCase(lldbmi_testcase.MiT
         self.runCmd("-data-list-register-values x 0")
         self.expect("\^done,register-values=\[{number=\"0\",value=\"0x[0-9a-f]+\"}\]")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_data_info_line(self):
@@ -316,7 +310,6 @@ class MiDataTestCase(lldbmi_testcase.MiT
         self.runCmd("-data-info-line main.cpp:0")
         self.expect("\^error,msg=\"error: zero is an invalid line number")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_data_evaluate_expression(self):

Modified: lldb/trunk/test/tools/lldb-mi/interpreter/TestMiCliSupport.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/tools/lldb-mi/interpreter/TestMiCliSupport.py?rev=251400&r1=251399&r2=251400&view=diff
==============================================================================
--- lldb/trunk/test/tools/lldb-mi/interpreter/TestMiCliSupport.py (original)
+++ lldb/trunk/test/tools/lldb-mi/interpreter/TestMiCliSupport.py Tue Oct 27 04:34:34 2015
@@ -13,7 +13,6 @@ class MiCliSupportTestCase(lldbmi_testca
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_target_create(self):
@@ -32,7 +31,6 @@ class MiCliSupportTestCase(lldbmi_testca
         self.expect("\^running")
         self.expect("\*stopped,reason=\"breakpoint-hit\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @skipIfLinux # llvm.org/pr22841: lldb-mi tests fail on all Linux buildbots
@@ -56,7 +54,6 @@ class MiCliSupportTestCase(lldbmi_testca
         self.expect("=breakpoint-modified,bkpt={number=\"1\"")
         self.expect("\*stopped,reason=\"breakpoint-hit\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @skipIfLinux # llvm.org/pr22841: lldb-mi tests fail on all Linux buildbots
@@ -81,7 +78,6 @@ class MiCliSupportTestCase(lldbmi_testca
         # Test that arguments were passed properly
         self.expect("@\"argc=5\\\\r\\\\n\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @skipIfLinux # llvm.org/pr22841: lldb-mi tests fail on all Linux buildbots
@@ -106,7 +102,6 @@ class MiCliSupportTestCase(lldbmi_testca
         # Test that arguments were passed properly
         self.expect("@\"argc=5\\\\r\\\\n\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @skipIfLinux # llvm.org/pr22841: lldb-mi tests fail on all Linux buildbots
@@ -130,7 +125,6 @@ class MiCliSupportTestCase(lldbmi_testca
         # Test that breakpoint hit
         self.expect("\*stopped,reason=\"breakpoint-hit\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @skipIfLinux # llvm.org/pr22841: lldb-mi tests fail on all Linux buildbots
@@ -161,7 +155,6 @@ class MiCliSupportTestCase(lldbmi_testca
         if it == 0:
             self.expect("\*stopped,reason=\"end-stepping-range\".+?func=\"main\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @skipIfLinux # llvm.org/pr22841: lldb-mi tests fail on all Linux buildbots
@@ -187,7 +180,6 @@ class MiCliSupportTestCase(lldbmi_testca
         self.expect("@\"argc=1\\\\r\\\\n\"")
         self.expect("\*stopped,reason=\"end-stepping-range\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @skipIfLinux # llvm.org/pr22841: lldb-mi tests fail on all Linux buildbots

Modified: lldb/trunk/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py?rev=251400&r1=251399&r2=251400&view=diff
==============================================================================
--- lldb/trunk/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py (original)
+++ lldb/trunk/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py Tue Oct 27 04:34:34 2015
@@ -13,7 +13,6 @@ class MiInterpreterExecTestCase(lldbmi_t
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_target_create(self):
@@ -32,7 +31,6 @@ class MiInterpreterExecTestCase(lldbmi_t
         self.expect("\^running")
         self.expect("\*stopped,reason=\"breakpoint-hit\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_breakpoint_set(self):
@@ -55,7 +53,6 @@ class MiInterpreterExecTestCase(lldbmi_t
         self.expect("=breakpoint-modified,bkpt={number=\"1\"")
         self.expect("\*stopped,reason=\"breakpoint-hit\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @expectedFailureLinux  # Failing in ~9/600 dosep runs (build 3120-3122)
@@ -88,7 +85,6 @@ class MiInterpreterExecTestCase(lldbmi_t
         # Test that program exited normally
         self.expect("\*stopped,reason=\"exited-normally\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @expectedFailureLinux  # Failing in ~9/600 dosep runs (build 3120-3122)
@@ -132,7 +128,6 @@ class MiInterpreterExecTestCase(lldbmi_t
         # Hit BP_return
         self.expect("\*stopped,reason=\"breakpoint-hit\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_process_launch(self):
@@ -155,7 +150,6 @@ class MiInterpreterExecTestCase(lldbmi_t
         # Test that breakpoint hit
         self.expect("\*stopped,reason=\"breakpoint-hit\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_thread_step_in(self):
@@ -185,7 +179,6 @@ class MiInterpreterExecTestCase(lldbmi_t
         if it == 0:
             self.expect("\*stopped,reason=\"end-stepping-range\".+?func=\"main\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_thread_step_over(self):
@@ -210,7 +203,6 @@ class MiInterpreterExecTestCase(lldbmi_t
         self.expect("@\"argc=1\\\\r\\\\n\"")
         self.expect("\*stopped,reason=\"end-stepping-range\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_thread_continue(self):

Modified: lldb/trunk/test/tools/lldb-mi/lldbmi_testcase.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/tools/lldb-mi/lldbmi_testcase.py?rev=251400&r1=251399&r2=251400&view=diff
==============================================================================
--- lldb/trunk/test/tools/lldb-mi/lldbmi_testcase.py (original)
+++ lldb/trunk/test/tools/lldb-mi/lldbmi_testcase.py Tue Oct 27 04:34:34 2015
@@ -14,6 +14,9 @@ class MiTestCaseBase(Base):
     myexe = "a.out"
     mylog = "child.log"
 
+    def getCategories(self):
+        return ['lldb-mi']
+
     @classmethod
     def classCleanup(cls):
         TestBase.RemoveTempFile(cls.myexe)

Modified: lldb/trunk/test/tools/lldb-mi/signal/TestMiSignal.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/tools/lldb-mi/signal/TestMiSignal.py?rev=251400&r1=251399&r2=251400&view=diff
==============================================================================
--- lldb/trunk/test/tools/lldb-mi/signal/TestMiSignal.py (original)
+++ lldb/trunk/test/tools/lldb-mi/signal/TestMiSignal.py Tue Oct 27 04:34:34 2015
@@ -13,7 +13,6 @@ class MiSignalTestCase(lldbmi_testcase.M
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Fails on FreeBSD apparently due to thread race conditions
     def test_lldbmi_stopped_when_interrupt(self):
@@ -50,7 +49,6 @@ class MiSignalTestCase(lldbmi_testcase.M
         self.child.sendintr() #FIXME: here uses self.child directly
         self.expect("\*stopped,reason=\"signal-received\",signal-name=\"SIGINT\",signal-meaning=\"Interrupt\",.*thread-id=\"1\",stopped-threads=\"all\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Fails on FreeBSD apparently due to thread race conditions
     @skipIfLinux # llvm.org/pr22841: lldb-mi tests fail on all Linux buildbots
@@ -81,7 +79,6 @@ class MiSignalTestCase(lldbmi_testcase.M
         self.expect("\^running")
         self.expect("\*stopped,reason=\"breakpoint-hit\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipUnlessDarwin
     def test_lldbmi_stopped_when_stopatentry_remote(self):
@@ -120,7 +117,6 @@ class MiSignalTestCase(lldbmi_testcase.M
         self.runCmd("-gdb-exit")
         self.expect("\^exit")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @skipIfLinux # llvm.org/pr22841: lldb-mi tests fail on all Linux buildbots
@@ -153,7 +149,6 @@ class MiSignalTestCase(lldbmi_testcase.M
         self.expect([ "\*stopped,reason=\"exception-received\",exception=\"EXC_BAD_ACCESS \(code=1, address=0x0\)\",thread-id=\"1\",stopped-threads=\"all\"",
                       "\*stopped,reason=\"exception-received\",exception=\"invalid address \(fault address: 0x0\)\",thread-id=\"1\",stopped-threads=\"all\"" ])
 
-    @lldbmi_test
     @skipUnlessDarwin
     def test_lldbmi_stopped_when_segfault_remote(self):
         """Test that 'lldb-mi --interpreter' notifies after it was stopped when segfault occurred (remote)."""

Modified: lldb/trunk/test/tools/lldb-mi/stack/TestMiStack.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/tools/lldb-mi/stack/TestMiStack.py?rev=251400&r1=251399&r2=251400&view=diff
==============================================================================
--- lldb/trunk/test/tools/lldb-mi/stack/TestMiStack.py (original)
+++ lldb/trunk/test/tools/lldb-mi/stack/TestMiStack.py Tue Oct 27 04:34:34 2015
@@ -13,7 +13,6 @@ class MiStackTestCase(lldbmi_testcase.Mi
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_stack_list_arguments(self):
@@ -75,7 +74,6 @@ class MiStackTestCase(lldbmi_testcase.Mi
         self.runCmd("-stack-list-arguments 0 0")
         self.expect("\^error,msg=\"Command 'stack-list-arguments'\. Thread frame range invalid\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_stack_list_locals(self):
@@ -202,7 +200,6 @@ class MiStackTestCase(lldbmi_testcase.Mi
         self.runCmd("-stack-list-locals --simple-values")
         self.expect("\^done,locals=\[{name=\"test_str\",type=\"const char \*\",value=\".*?Rakaposhi.*?\"},{name=\"var_e\",type=\"int\",value=\"24\"},{name=\"ptr\",type=\"int \*\",value=\".*?\"}\]")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_stack_list_variables(self):
@@ -329,7 +326,6 @@ class MiStackTestCase(lldbmi_testcase.Mi
         self.runCmd("-stack-list-variables --simple-values")
         self.expect("\^done,variables=\[{arg=\"1\",name=\"arg_str\",type=\"const char \*\",value=\".*?String.*?\"},{arg=\"1\",name=\"arg_ptr\",type=\"int \*\",value=\".*?\"},{name=\"test_str\",type=\"const char \*\",value=\".*?Rakaposhi.*?\"},{name=\"var_e\",type=\"int\",value=\"24\"},{name=\"ptr\",type=\"int \*\",value=\".*?\"}\]")
         
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_stack_info_depth(self):
@@ -363,7 +359,6 @@ class MiStackTestCase(lldbmi_testcase.Mi
         self.runCmd("-stack-info-depth -1")
         #self.expect("\^error")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @skipUnlessDarwin
@@ -404,7 +399,6 @@ class MiStackTestCase(lldbmi_testcase.Mi
         self.runCmd("-stack-info-frame unknown_arg")
         #self.expect("\^error")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_stack_list_frames(self):
@@ -427,7 +421,6 @@ class MiStackTestCase(lldbmi_testcase.Mi
         self.runCmd("-stack-list-frames 0 0")
         self.expect("\^done,stack=\[frame=\{level=\"0\",addr=\"0x[0-9a-f]+\",func=\"main\",file=\"main\.cpp\",fullname=\".+?main\.cpp\",line=\"\d+\"\}\]")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_stack_select_frame(self):

Modified: lldb/trunk/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py?rev=251400&r1=251399&r2=251400&view=diff
==============================================================================
--- lldb/trunk/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py (original)
+++ lldb/trunk/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py Tue Oct 27 04:34:34 2015
@@ -13,7 +13,6 @@ class MiStartupOptionsTestCase(lldbmi_te
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_executable_option_file(self):
@@ -40,7 +39,6 @@ class MiStartupOptionsTestCase(lldbmi_te
         self.expect("\^running")
         self.expect("\*stopped,reason=\"exited-normally\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_executable_option_unknown_file(self):
@@ -58,7 +56,6 @@ class MiStartupOptionsTestCase(lldbmi_te
         # Test that lldb-mi is ready when executable was loaded
         self.expect(self.child_prompt, exactly = True)
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_executable_option_absolute_path(self):
@@ -82,7 +79,6 @@ class MiStartupOptionsTestCase(lldbmi_te
         self.expect("\^running")
         self.expect("\*stopped,reason=\"exited-normally\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_executable_option_relative_path(self):
@@ -105,7 +101,6 @@ class MiStartupOptionsTestCase(lldbmi_te
         self.expect("\^running")
         self.expect("\*stopped,reason=\"exited-normally\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_executable_option_unknown_path(self):
@@ -123,7 +118,6 @@ class MiStartupOptionsTestCase(lldbmi_te
         # Test that lldb-mi is ready when executable was loaded
         self.expect(self.child_prompt, exactly = True)
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @skipIfLinux # llvm.org/pr22841: lldb-mi tests fail on all Linux buildbots
@@ -166,7 +160,6 @@ class MiStartupOptionsTestCase(lldbmi_te
         self.expect("\^done,value=\"10\"")
         self.expect(self.child_prompt, exactly = True)
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @skipIfLinux # llvm.org/pr22841: lldb-mi tests fail on all Linux buildbots
@@ -210,7 +203,6 @@ class MiStartupOptionsTestCase(lldbmi_te
         self.expect("\^exit")
         self.expect("\*stopped,reason=\"exited-normally\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_source_option_start_script_error(self):
@@ -232,7 +224,6 @@ class MiStartupOptionsTestCase(lldbmi_te
         # Test that lldb-mi is ready after execution of --source start_script
         self.expect(self.child_prompt, exactly = True)
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_log_option(self):
@@ -264,7 +255,6 @@ class MiStartupOptionsTestCase(lldbmi_te
         for f in logFile:
             os.remove(f)
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_log_directory_option(self):

Modified: lldb/trunk/test/tools/lldb-mi/symbol/TestMiSymbol.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/tools/lldb-mi/symbol/TestMiSymbol.py?rev=251400&r1=251399&r2=251400&view=diff
==============================================================================
--- lldb/trunk/test/tools/lldb-mi/symbol/TestMiSymbol.py (original)
+++ lldb/trunk/test/tools/lldb-mi/symbol/TestMiSymbol.py Tue Oct 27 04:34:34 2015
@@ -13,7 +13,6 @@ class MiSymbolTestCase(lldbmi_testcase.M
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_symbol_list_lines_file(self):

Modified: lldb/trunk/test/tools/lldb-mi/syntax/TestMiSyntax.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/tools/lldb-mi/syntax/TestMiSyntax.py?rev=251400&r1=251399&r2=251400&view=diff
==============================================================================
--- lldb/trunk/test/tools/lldb-mi/syntax/TestMiSyntax.py (original)
+++ lldb/trunk/test/tools/lldb-mi/syntax/TestMiSyntax.py Tue Oct 27 04:34:34 2015
@@ -13,7 +13,6 @@ class MiSyntaxTestCase(lldbmi_testcase.M
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_tokens(self):
@@ -37,7 +36,6 @@ class MiSyntaxTestCase(lldbmi_testcase.M
         self.expect("0000000000000000000003\^running")
         self.expect("\*stopped,reason=\"exited-normally\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_specialchars(self):
@@ -61,7 +59,6 @@ class MiSyntaxTestCase(lldbmi_testcase.M
         self.expect("\^running")
         self.expect("\*stopped,reason=\"breakpoint-hit\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @expectedFailureLinux  # Failing in ~6/600 dosep runs (build 3120-3122)

Modified: lldb/trunk/test/tools/lldb-mi/target/TestMiTarget.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/tools/lldb-mi/target/TestMiTarget.py?rev=251400&r1=251399&r2=251400&view=diff
==============================================================================
--- lldb/trunk/test/tools/lldb-mi/target/TestMiTarget.py (original)
+++ lldb/trunk/test/tools/lldb-mi/target/TestMiTarget.py Tue Oct 27 04:34:34 2015
@@ -13,7 +13,6 @@ class MiTargetTestCase(lldbmi_testcase.M
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @skipIfLinux # cannot attach to process on linux
@@ -55,7 +54,6 @@ class MiTargetTestCase(lldbmi_testcase.M
         self.runCmd("-target-detach")
         self.expect("\^done")
         
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @skipIfLinux # cannot attach to process on linux
@@ -91,7 +89,6 @@ class MiTargetTestCase(lldbmi_testcase.M
         self.runCmd("-target-detach")
         self.expect("\^done")
         
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @skipIfLinux # cannot attach to process on linux

Modified: lldb/trunk/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py?rev=251400&r1=251399&r2=251400&view=diff
==============================================================================
--- lldb/trunk/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py (original)
+++ lldb/trunk/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py Tue Oct 27 04:34:34 2015
@@ -25,7 +25,6 @@ class MiGdbSetShowTestCase(lldbmi_testca
         self.runCmd("-var-create - * " + var)
         self.expect('\^done,name="var\d+",numchild="[0-9]+",value="%s",type="%s",thread-id="1",has_more="0"' % (value, typ))
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @skipIfLinux # llvm.org/pr22841: lldb-mi tests fail on all Linux buildbots
@@ -108,7 +107,6 @@ class MiGdbSetShowTestCase(lldbmi_testca
         self.runCmd("-gdb-set print char-array-as-string unknown")
         self.expect("\^error,msg=\"The request ''print' expects option-name and \"on\" or \"off\"' failed.\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi working on Windows
     @expectedFailureGcc("https://llvm.org/bugs/show_bug.cgi?id=23357")
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
@@ -168,7 +166,6 @@ class MiGdbSetShowTestCase(lldbmi_testca
         self.runCmd("-gdb-set print expand-aggregates unknown")
         self.expect("\^error,msg=\"The request ''print' expects option-name and \"on\" or \"off\"' failed.\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi working on Windows
     @expectedFailureGcc("https://llvm.org/bugs/show_bug.cgi?id=23357")
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races

Modified: lldb/trunk/test/tools/lldb-mi/variable/TestMiVar.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/tools/lldb-mi/variable/TestMiVar.py?rev=251400&r1=251399&r2=251400&view=diff
==============================================================================
--- lldb/trunk/test/tools/lldb-mi/variable/TestMiVar.py (original)
+++ lldb/trunk/test/tools/lldb-mi/variable/TestMiVar.py Tue Oct 27 04:34:34 2015
@@ -13,7 +13,6 @@ class MiVarTestCase(lldbmi_testcase.MiTe
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @expectedFailureAll("llvm.org/pr23560", oslist=["linux"], compiler="gcc", compiler_version=[">=","4.9"], archs=["i386"])
@@ -125,7 +124,6 @@ class MiVarTestCase(lldbmi_testcase.MiTe
         # FIXME: The name below is not correct. It should be "var.*argv[0]".
         self.expect("\^done,numchild=\"1\",children=\[child=\{name=\"var6\.\*\$[0-9]+\",exp=\"\*\$[0-9]+\",numchild=\"0\",type=\"const char\",thread-id=\"4294967295\",value=\"47 '/'\",has_more=\"0\"\}\],has_more=\"0\"") #FIXME -var-list-children shows invalid thread-id
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @skipIfLinux # llvm.org/pr22841: lldb-mi tests fail on all Linux buildbots
@@ -190,7 +188,6 @@ class MiVarTestCase(lldbmi_testcase.MiTe
         self.runCmd("-var-update --all-values var_complx_array")
         self.expect("\^done,changelist=\[\{name=\"var_complx_array\",value=\"\[2\]\",in_scope=\"true\",type_changed=\"false\",has_more=\"0\"\}\]")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_var_create_register(self):
@@ -230,7 +227,6 @@ class MiVarTestCase(lldbmi_testcase.MiTe
         self.runCmd("-data-list-register-values d 0")
         self.expect("\^done,register-values=\[{number=\"0\",value=\"6\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @skipIfLinux # llvm.org/pr22841: lldb-mi tests fail on all Linux buildbots
@@ -332,7 +328,6 @@ class MiVarTestCase(lldbmi_testcase.MiTe
         self.runCmd("-var-list-children 0 var_complx 0")
         self.expect("\^error,msg=\"Command 'var-list-children'. Variable children range invalid\"")
 
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @skipIfLinux # llvm.org/pr22841: lldb-mi tests fail on all Linux buildbots
@@ -357,7 +352,6 @@ class MiVarTestCase(lldbmi_testcase.MiTe
         self.runCmd("-var-create - * std_string")
         self.expect('\^done,name="var\d+",numchild="[0-9]+",value="\\\\"hello\\\\"",type="std::[\S]*?string",thread-id="1",has_more="0"')
  
-    @lldbmi_test
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @skipIfLinux # llvm.org/pr22841: lldb-mi tests fail on all Linux buildbots




More information about the lldb-commits mailing list