Remove deprecated command line options from dotest.py

llvm-svn: 255278

diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py
index 6848324..bdb5fd6 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/dotest.py
+++ b/lldb/packages/Python/lldbsuite/test/dotest.py
@@ -289,16 +289,6 @@ def parseOptionsAndInitTestdirs():
     elif args.N == 'dsym':
         configuration.dont_do_dsym_test = True
 
-    if args.a or args.plus_a:
-        print("Options '-a' and '+a' have been deprecated. Please use the test category\n"
-              "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.d:
         sys.stdout.write("Suspending the process %d to wait for debugger to attach...\n" % os.getpid())
         sys.stdout.flush()

diff --git a/lldb/packages/Python/lldbsuite/test/dotest_args.py b/lldb/packages/Python/lldbsuite/test/dotest_args.py
index 7fc012f..27064b9 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/dotest_args.py
+++ b/lldb/packages/Python/lldbsuite/test/dotest_args.py
@@ -167,15 +167,6 @@ def create_parser():
     # Remove the reference to our helper function
     del X
 
-    D = lambda optstr, **kwargs: group.add_argument(optstr, action='store_true', **kwargs)
-    group = parser.add_argument_group('Deprecated options (do not use)')
-    # 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')
     group.add_argument('args', metavar='test-dir', nargs='*', help='Specify a list of directory names to search for test modules named after Test*.py (test discovery). If empty, search from the current working directory instead.')