Remove -S option from dotest.py.
llvm-svn: 255361
diff --git a/lldb/packages/Python/lldbsuite/test/configuration.py b/lldb/packages/Python/lldbsuite/test/configuration.py
index a827a24..7fd68b6 100644
--- a/lldb/packages/Python/lldbsuite/test/configuration.py
+++ b/lldb/packages/Python/lldbsuite/test/configuration.py
@@ -89,9 +89,6 @@
# The filters (testclass.testmethod) used to admit tests into our test suite.
filters = []
-# By default, we do not skip build and cleanup. Use '-S' option to override.
-skip_build_and_cleanup = False
-
# By default, we skip long running test case. Use '-l' option to override.
skip_long_running_test = True
diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py
index 02cc8ca..bf222cf 100644
--- a/lldb/packages/Python/lldbsuite/test/dotest.py
+++ b/lldb/packages/Python/lldbsuite/test/dotest.py
@@ -327,9 +327,6 @@
if args.q:
configuration.parsable = True
- if args.S:
- configuration.skip_build_and_cleanup = True
-
if args.s:
if args.s.startswith('-'):
usage(parser)
diff --git a/lldb/packages/Python/lldbsuite/test/dotest_args.py b/lldb/packages/Python/lldbsuite/test/dotest_args.py
index 064ae77..ddb615e 100644
--- a/lldb/packages/Python/lldbsuite/test/dotest_args.py
+++ b/lldb/packages/Python/lldbsuite/test/dotest_args.py
@@ -86,7 +86,6 @@
group = parser.add_argument_group('Runtime behaviour options')
X('-d', 'Suspend the process after launch to wait indefinitely for a debugger to attach')
X('-q', "Don't print extra output from this script.")
- X('-S', "Skip the build and cleanup while running the test. Use this option with care as you would need to build the inferior(s) by hand and build the executable(s) with the correct name(s). This can be used with '-# n' to stress test certain test cases for n number of times")
X('-t', 'Turn on tracing of lldb command and other detailed test executions')
group.add_argument('-u', dest='unset_env_varnames', metavar='variable', action='append', help='Specify an environment variable to unset before running the test cases. e.g., -u DYLD_INSERT_LIBRARIES -u MallocScribble')
group.add_argument('--env', dest='set_env_vars', metavar='variable', action='append', help='Specify an environment variable to set to the given value before running the test cases e.g.: --env CXXFLAGS=-O3 --env DYLD_INSERT_LIBRARIES')
diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py
index 34481a2..77caab5 100644
--- a/lldb/packages/Python/lldbsuite/test/lldbtest.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py
@@ -1349,7 +1349,7 @@
Do class-wide cleanup.
"""
- if doCleanup and not configuration.skip_build_and_cleanup:
+ if doCleanup:
# First, let's do the platform-specific cleanup.
module = builder_module()
module.cleanup()
@@ -2133,8 +2133,6 @@
def buildDefault(self, architecture=None, compiler=None, dictionary=None, clean=True):
"""Platform specific way to build the default binaries."""
- if configuration.skip_build_and_cleanup:
- return
module = builder_module()
if target_is_android():
dictionary = append_android_envs(dictionary)
@@ -2143,16 +2141,12 @@
def buildDsym(self, architecture=None, compiler=None, dictionary=None, clean=True):
"""Platform specific way to build binaries with dsym info."""
- if configuration.skip_build_and_cleanup:
- return
module = builder_module()
if not module.buildDsym(self, architecture, compiler, dictionary, clean):
raise Exception("Don't know how to build binary with dsym")
def buildDwarf(self, architecture=None, compiler=None, dictionary=None, clean=True):
"""Platform specific way to build binaries with dwarf maps."""
- if configuration.skip_build_and_cleanup:
- return
module = builder_module()
if target_is_android():
dictionary = append_android_envs(dictionary)
@@ -2161,8 +2155,6 @@
def buildDwo(self, architecture=None, compiler=None, dictionary=None, clean=True):
"""Platform specific way to build binaries with dwarf maps."""
- if configuration.skip_build_and_cleanup:
- return
module = builder_module()
if target_is_android():
dictionary = append_android_envs(dictionary)
@@ -2238,8 +2230,6 @@
def cleanup(self, dictionary=None):
"""Platform specific way to do cleanup after build."""
- if configuration.skip_build_and_cleanup:
- return
module = builder_module()
if not module.cleanup(self, dictionary):
raise Exception("Don't know how to do cleanup with dictionary: "+dictionary)
@@ -2755,8 +2745,6 @@
def build(self, architecture=None, compiler=None, dictionary=None, clean=True):
"""Platform specific way to build the default binaries."""
- if configuration.skip_build_and_cleanup:
- return
module = builder_module()
if target_is_android():
dictionary = append_android_envs(dictionary)
diff --git a/lldb/packages/Python/lldbsuite/test/source-manager/TestSourceManager.py b/lldb/packages/Python/lldbsuite/test/source-manager/TestSourceManager.py
index 50a0c90..b4e7541 100644
--- a/lldb/packages/Python/lldbsuite/test/source-manager/TestSourceManager.py
+++ b/lldb/packages/Python/lldbsuite/test/source-manager/TestSourceManager.py
@@ -26,7 +26,6 @@
TestBase.setUp(self)
# Find the line number to break inside main().
self.line = line_number('main.c', '// Set break point at this line.')
- configuration.skip_build_and_cleanup = False
@add_test_categories(['pyapi'])
def test_display_source_python(self):