diff options
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test')
7 files changed, 8 insertions, 27 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py b/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py index 5d759399c41..81e364d7f7f 100644 --- a/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py +++ b/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py @@ -17,10 +17,7 @@ class AttachThenDisassemblyBench(BenchBase): def setUp(self): BenchBase.setUp(self) - if configuration.bmExecutable: - self.exe = configuration.bmExecutable - else: - self.exe = lldbtest_config.lldbExec + self.exe = lldbtest_config.lldbExec self.count = configuration.bmIterationCount if self.count <= 0: self.count = 10 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 2031749be31..d0dfcd30d2f 100644 --- a/lldb/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py +++ b/lldb/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py @@ -7,6 +7,7 @@ from __future__ import print_function import os, sys import lldb from lldbsuite.test import configuration +from lldbsuite.test import lldbtest_config from lldbsuite.test.lldbbench import * class FrameVariableResponseBench(BenchBase): @@ -15,10 +16,7 @@ class FrameVariableResponseBench(BenchBase): def setUp(self): BenchBase.setUp(self) - if configuration.bmExecutable: - self.exe = configuration.bmExecutable - else: - self.exe = lldbtest_config.lldbExec + self.exe = lldbtest_config.lldbExec if configuration.bmBreakpointSpec: self.break_spec = configuration.bmBreakpointSpec else: diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py b/lldb/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py index 5322503abe4..b2d471c3628 100644 --- a/lldb/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py +++ b/lldb/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py @@ -7,6 +7,7 @@ from __future__ import print_function import os, sys import lldb from lldbsuite.test import configuration +from lldbsuite.test import lldbtest_config from lldbsuite.test.lldbbench import * class StartupDelaysBench(BenchBase): @@ -20,10 +21,7 @@ class StartupDelaysBench(BenchBase): self.stopwatch2 = Stopwatch() # Create self.stopwatch3 for measuring "run to breakpoint". self.stopwatch3 = Stopwatch() - if configuration.bmExecutable: - self.exe = configuration.bmExecutable - else: - self.exe = lldbtest_config.lldbExec + self.exe = lldbtest_config.lldbExec if configuration.bmBreakpointSpec: self.break_spec = configuration.bmBreakpointSpec else: diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py b/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py index fe22a5a1bbd..8e3a14a408b 100644 --- a/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py +++ b/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py @@ -5,6 +5,7 @@ from __future__ import print_function import os, sys import lldb from lldbsuite.test import configuration +from lldbsuite.test import lldbtest_config from lldbsuite.test.lldbbench import * class SteppingSpeedBench(BenchBase): @@ -13,10 +14,7 @@ class SteppingSpeedBench(BenchBase): def setUp(self): BenchBase.setUp(self) - if configuration.bmExecutable: - self.exe = configuration.bmExecutable - else: - self.exe = lldbtest_config.lldbExec + self.exe = lldbtest_config.lldbExec if configuration.bmBreakpointSpec: self.break_spec = configuration.bmBreakpointSpec else: diff --git a/lldb/packages/Python/lldbsuite/test/configuration.py b/lldb/packages/Python/lldbsuite/test/configuration.py index aced15add2b..f06bbac05fe 100644 --- a/lldb/packages/Python/lldbsuite/test/configuration.py +++ b/lldb/packages/Python/lldbsuite/test/configuration.py @@ -86,9 +86,7 @@ compilers = None # Must be initialized after option parsing # just that. cflags_extras = '' -# Full path of the benchmark executable, as specified by the '-e' option. -bmExecutable = None -# The breakpoint specification of bmExecutable, as specified by the '-x' option. +# 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 266c1948a2e..cf7bb5c20ad 100644 --- a/lldb/packages/Python/lldbsuite/test/dotest.py +++ b/lldb/packages/Python/lldbsuite/test/dotest.py @@ -305,13 +305,6 @@ def parseOptionsAndInitTestdirs(): sys.stdout.flush() os.kill(os.getpid(), signal.SIGSTOP) - if args.e: - if args.e.startswith('-'): - usage(parser) - configuration.bmExecutable = args.e - if not is_exe(configuration.bmExecutable): - usage(parser) - if args.F: configuration.failfast = True diff --git a/lldb/packages/Python/lldbsuite/test/dotest_args.py b/lldb/packages/Python/lldbsuite/test/dotest_args.py index c5cf154c5da..4284c0f4d81 100644 --- a/lldb/packages/Python/lldbsuite/test/dotest_args.py +++ b/lldb/packages/Python/lldbsuite/test/dotest_args.py @@ -70,7 +70,6 @@ def create_parser(): group = parser.add_argument_group('Configuration options') group.add_argument('--framework', metavar='framework-path', help='The path to LLDB.framework') group.add_argument('--executable', metavar='executable-path', help='The path to the lldb executable') - group.add_argument('-e', metavar='benchmark-exe', help='Specify the full path of an executable used for benchmark purposes (see also: -x)') group.add_argument('-k', metavar='command', action='append', help="Specify a runhook, which is an lldb command to be executed by the debugger; The option can occur multiple times. The commands are executed one after the other to bring the debugger to a desired state, so that, for example, further benchmarking can be done") 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") |
