From 70ed57389afc7690751f2fd8ad6c8d0871d5e53b Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Thu, 10 Dec 2015 18:51:40 +0000 Subject: [PATCH] Remove the -x option from dotest.py. llvm-svn: 255279 --- .../test/benchmarks/frame_variable/TestFrameVariableResponse.py | 5 +---- .../Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py | 5 +---- .../Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py | 5 +---- lldb/packages/Python/lldbsuite/test/configuration.py | 2 -- lldb/packages/Python/lldbsuite/test/dotest.py | 5 ----- lldb/packages/Python/lldbsuite/test/dotest_args.py | 1 - 6 files changed, 3 insertions(+), 20 deletions(-) diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py b/lldb/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py index d0dfcd3..16dd887 100644 --- a/lldb/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py +++ b/lldb/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py @@ -17,10 +17,7 @@ class FrameVariableResponseBench(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: diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py b/lldb/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py index b2d471c..d0532cd 100644 --- a/lldb/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py +++ b/lldb/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py @@ -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: diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py b/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py index 8e3a14a..db2bd73 100644 --- a/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py +++ b/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py @@ -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: diff --git a/lldb/packages/Python/lldbsuite/test/configuration.py b/lldb/packages/Python/lldbsuite/test/configuration.py index 02f04c7..a7b97bb 100644 --- a/lldb/packages/Python/lldbsuite/test/configuration.py +++ b/lldb/packages/Python/lldbsuite/test/configuration.py @@ -86,8 +86,6 @@ compilers = None # Must be initialized after option parsing # 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 diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py index bdb5fd6..1a845c5 100644 --- a/lldb/packages/Python/lldbsuite/test/dotest.py +++ b/lldb/packages/Python/lldbsuite/test/dotest.py @@ -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 diff --git a/lldb/packages/Python/lldbsuite/test/dotest_args.py b/lldb/packages/Python/lldbsuite/test/dotest_args.py index 27064b9..45b9764 100644 --- a/lldb/packages/Python/lldbsuite/test/dotest_args.py +++ b/lldb/packages/Python/lldbsuite/test/dotest_args.py @@ -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")) -- 2.7.4