[Lldb-commits] [lldb] r255279 - Remove the -x option from dotest.py.

[Zachary Turner via lldb-commits]

Author: zturner
Date: Thu Dec 10 12:51:40 2015
New Revision: 255279

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

Modified:
    lldb/trunk/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py
    lldb/trunk/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py
    lldb/trunk/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py
    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

Modified: lldb/trunk/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py?rev=255279&r1=255278&r2=255279&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py Thu Dec 10 12:51:40 2015
@@ -17,10 +17,7 @@ class FrameVariableResponseBench(BenchBa
     def setUp(self):
         BenchBase.setUp(self)
         self.exe = lldbtest_config.lldbExec
-        if configuration.bmBreakpointSpec:
-            self.break_spec = configuration.bmBreakpointSpec
-        else:
-            self.break_spec = '-n main'
+        self.break_spec = '-n main'
 
         self.count = configuration.bmIterationCount
         if self.count <= 0:

Modified: lldb/trunk/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py?rev=255279&r1=255278&r2=255279&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py Thu Dec 10 12:51:40 2015
@@ -22,10 +22,7 @@ class StartupDelaysBench(BenchBase):
         # Create self.stopwatch3 for measuring "run to breakpoint".
         self.stopwatch3 = Stopwatch()
         self.exe = lldbtest_config.lldbExec
-        if configuration.bmBreakpointSpec:
-            self.break_spec = configuration.bmBreakpointSpec
-        else:
-            self.break_spec = '-n main'
+        self.break_spec = '-n main'
 
         self.count = configuration.bmIterationCount
         if self.count <= 0:

Modified: lldb/trunk/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py?rev=255279&r1=255278&r2=255279&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py Thu Dec 10 12:51:40 2015
@@ -15,10 +15,7 @@ class SteppingSpeedBench(BenchBase):
     def setUp(self):
         BenchBase.setUp(self)
         self.exe = lldbtest_config.lldbExec
-        if configuration.bmBreakpointSpec:
-            self.break_spec = configuration.bmBreakpointSpec
-        else:
-            self.break_spec = '-n main'
+        self.break_spec = '-n main'
 
         self.count = configuration.bmIterationCount
         if self.count <= 0:

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=255279&r1=255278&r2=255279&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/configuration.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/configuration.py Thu Dec 10 12:51:40 2015
@@ -86,8 +86,6 @@ compilers = None    # Must be initialize
 # just that.
 cflags_extras = ''
 
-# The breakpoint specification of the benchmark exe, as specified by the '-x' option.
-bmBreakpointSpec = None
 # The benchmark iteration count, as specified by the '-y' option.
 bmIterationCount = -1
 

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=255279&r1=255278&r2=255279&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/dotest.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/dotest.py Thu Dec 10 12:51:40 2015
@@ -358,11 +358,6 @@ def parseOptionsAndInitTestdirs():
     if args.v:
         configuration.verbose = 2
 
-    if args.x:
-        if args.x.startswith('-'):
-            usage(parser)
-        configuration.bmBreakpointSpec = args.x
-
     # argparse makes sure we have a number
     if args.y:
         configuration.bmIterationCount = args.y

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=255279&r1=255278&r2=255279&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/dotest_args.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/dotest_args.py Thu Dec 10 12:51:40 2015
@@ -73,7 +73,6 @@ def create_parser():
     group.add_argument('-R', metavar='dir', help='Specify a directory to relocate the tests and their intermediate files to. BE WARNED THAT the directory, if exists, will be deleted before running this test driver. No cleanup of intermediate test files is performed in this case')
     group.add_argument('-r', metavar='dir', help="Similar to '-R', except that the directory must not exist before running this test driver")
     group.add_argument('-s', metavar='name', help='Specify the name of the dir created to store the session files of tests with errored or failed status. If not specified, the test driver uses the timestamp as the session dir name')
-    group.add_argument('-x', metavar='breakpoint-spec', help='Specify the breakpoint specification for the benchmark executable')
     group.add_argument('-y', type=int, metavar='count', help="Specify the iteration count used to collect our benchmarks. An example is the number of times to do 'thread step-over' to measure stepping speed.")
     group.add_argument('-#', type=int, metavar='sharp', dest='sharp', help='Repeat the test suite for a specified number of times')
     group.add_argument('--channel', metavar='channel', dest='channels', action='append', help=textwrap.dedent("Specify the log channels (and optional categories) e.g. 'lldb all' or 'gdb-remote packets' if no categories are specified, 'default' is used"))