Author: zturner
Date: Wed Dec 9 13:45:36 2015
New Revision: 255142
URL: http://llvm.org/viewvc/llvm-project?rev=255142&view=rev
Log:
Remove -e option from dotest.py.
This is part of an effort to clean up dotest command line options
that are no longer used.
Modified:
lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py
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/disassembly/TestDoAttachThenDisassembly.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py?rev=255142&r1=255141&r2=255142&view=diff
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py
(original)
+++
lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py
Wed Dec 9 13:45:36 2015
@@ -17,10 +17,7 @@ class AttachThenDisassemblyBench(BenchBa
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
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=255142&r1=255141&r2=255142&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
Wed Dec 9 13:45:36 2015
@@ -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(BenchBa
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:
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=255142&r1=255141&r2=255142&view=diff
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py
(original)
+++
lldb/trunk/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py
Wed Dec 9 13:45:36 2015
@@ -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:
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=255142&r1=255141&r2=255142&view=diff
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py
(original)
+++
lldb/trunk/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py
Wed Dec 9 13:45:36 2015
@@ -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:
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=255142&r1=255141&r2=255142&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/configuration.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/configuration.py Wed Dec 9
13:45:36 2015
@@ -86,9 +86,7 @@ compilers = None # Must be initialize
# 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
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=255142&r1=255141&r2=255142&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/dotest.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/dotest.py Wed Dec 9 13:45:36 2015
@@ -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
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=255142&r1=255141&r2=255142&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/dotest_args.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/dotest_args.py Wed Dec 9
13:45:36 2015
@@ -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")
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
