From 91142b1125aabd86d2307f340abc53351c4a7d94 Mon Sep 17 00:00:00 2001
From: Daniel Dunbar <daniel@zuster.org>
Date: Wed, 7 Aug 2013 03:14:00 +0000
Subject: [lit] Drop --no-execute, which isn't generally useful.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@187852 91177308-0d34-0410-b5e6-96231b3b80d8
---
 utils/lit/lit/LitConfig.py   | 4 +---
 utils/lit/lit/TestFormats.py | 3 ---
 utils/lit/lit/TestRunner.py  | 3 ---
 utils/lit/lit/discovery.py   | 1 -
 utils/lit/lit/main.py        | 4 ----
 5 files changed, 1 insertion(+), 14 deletions(-)

(limited to 'utils')

diff --git a/utils/lit/lit/LitConfig.py b/utils/lit/lit/LitConfig.py
index cb216ea1f4..c9c1454f0c 100644
--- a/utils/lit/lit/LitConfig.py
+++ b/utils/lit/lit/LitConfig.py
@@ -19,8 +19,7 @@ class LitConfig:
 
     def __init__(self, progname, path, quiet,
                  useValgrind, valgrindLeakCheck, valgrindArgs,
-                 noExecute, debug, isWindows,
-                 params, config_prefix = None):
+                 debug, isWindows, params, config_prefix = None):
         # The name of the test runner.
         self.progname = progname
         # The items to add to the PATH environment variable.
@@ -29,7 +28,6 @@ class LitConfig:
         self.useValgrind = bool(useValgrind)
         self.valgrindLeakCheck = bool(valgrindLeakCheck)
         self.valgrindUserArgs = list(valgrindArgs)
-        self.noExecute = noExecute
         self.debug = debug
         self.isWindows = bool(isWindows)
         self.params = dict(params)
diff --git a/utils/lit/lit/TestFormats.py b/utils/lit/lit/TestFormats.py
index 27085b9a75..7e4fafcf1a 100644
--- a/utils/lit/lit/TestFormats.py
+++ b/utils/lit/lit/TestFormats.py
@@ -99,9 +99,6 @@ class GoogleTest(object):
         if litConfig.useValgrind:
             cmd = litConfig.valgrindArgs + cmd
 
-        if litConfig.noExecute:
-            return Test.PASS, ''
-
         out, err, exitCode = TestRunner.executeCommand(
             cmd, env=test.config.environment)
 
diff --git a/utils/lit/lit/TestRunner.py b/utils/lit/lit/TestRunner.py
index daa9b7dfbb..d904616127 100644
--- a/utils/lit/lit/TestRunner.py
+++ b/utils/lit/lit/TestRunner.py
@@ -465,9 +465,6 @@ def executeShTest(test, litConfig, useExternalSh,
 
     script, isXFail, tmpBase, execdir = res
 
-    if litConfig.noExecute:
-        return (Test.PASS, '')
-
     # Create the output directory if it does not already exist.
     Util.mkdir_p(os.path.dirname(tmpBase))
 
diff --git a/utils/lit/lit/discovery.py b/utils/lit/lit/discovery.py
index 44f7867131..531281e5de 100644
--- a/utils/lit/lit/discovery.py
+++ b/utils/lit/lit/discovery.py
@@ -232,7 +232,6 @@ def load_test_suite(inputs):
                                     useValgrind = False,
                                     valgrindLeakCheck = False,
                                     valgrindArgs = [],
-                                    noExecute = False,
                                     debug = False,
                                     isWindows = (platform.system()=='Windows'),
                                     params = {})
diff --git a/utils/lit/lit/main.py b/utils/lit/lit/main.py
index 0faa55ed39..5070166c3c 100755
--- a/utils/lit/lit/main.py
+++ b/utils/lit/lit/main.py
@@ -214,9 +214,6 @@ def main(builtinParameters = {}):
     group.add_option("", "--time-tests", dest="timeTests",
                      help="Track elapsed wall time for each test",
                      action="store_true", default=False)
-    group.add_option("", "--no-execute", dest="noExecute",
-                     help="Don't execute any tests (assume PASS)",
-                     action="store_true", default=False)
     parser.add_option_group(group)
 
     group = OptionGroup(parser, "Test Selection")
@@ -283,7 +280,6 @@ def main(builtinParameters = {}):
                                     useValgrind = opts.useValgrind,
                                     valgrindLeakCheck = opts.valgrindLeakCheck,
                                     valgrindArgs = opts.valgrindArgs,
-                                    noExecute = opts.noExecute,
                                     debug = opts.debug,
                                     isWindows = (platform.system()=='Windows'),
                                     params = userParams,
-- 
cgit v1.2.3