From d8ffa5fe1b9c3c4a8e3266af7d383694d5354c12 Mon Sep 17 00:00:00 2001
From: Julian Lettner <jlettner@apple.com>
Date: Thu, 14 Feb 2019 22:46:56 +0000
Subject: [PATCH] [lit] Remove --single-process option (use -j1 instead)

Remove `--single-process` command line option. Use `-j1` instead.

Also see commit: 96adb78b120b6aa9739eb714534dc8e819f7bc52

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@354073 91177308-0d34-0410-b5e6-96231b3b80d8
---
 utils/lit/lit/main.py        | 14 +++-----------
 utils/lit/tests/discovery.py |  2 +-
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/utils/lit/lit/main.py b/utils/lit/lit/main.py
index 20b001e66da..bae6d91174d 100755
--- a/utils/lit/lit/main.py
+++ b/utils/lit/lit/main.py
@@ -321,10 +321,6 @@ def main_with_tmp(builtinParameters):
     debug_group.add_argument("--show-tests", dest="showTests",
                       help="Show all discovered tests",
                       action="store_true", default=False)
-    debug_group.add_argument("--single-process", dest="singleProcess",
-                      help="Don't run tests in parallel.  Intended for debugging "
-                      "single test failures",
-                      action="store_true", default=False)
 
     opts = parser.parse_args()
     args = opts.test_paths
@@ -336,7 +332,9 @@ def main_with_tmp(builtinParameters):
     if not args:
         parser.error('No inputs specified')
 
-    if opts.numThreads is not None and opts.numThreads <= 0:
+    if opts.numThreads is None:
+        opts.numThreads = lit.util.detectCPUs()
+    elif opts.numThreads <= 0:
         parser.error("Option '--threads' or '-j' requires positive integer")
 
     if opts.maxFailures is not None and opts.maxFailures <= 0:
@@ -480,12 +478,6 @@ def main_with_tmp(builtinParameters):
     if opts.maxTests is not None:
         run.tests = run.tests[:opts.maxTests]
 
-    # Determine number of workers to use.
-    if opts.singleProcess:
-        opts.numThreads = 1
-    elif opts.numThreads is None:
-        opts.numThreads = lit.util.detectCPUs()
-
     # Don't create more threads than tests.
     opts.numThreads = min(len(run.tests), opts.numThreads)
 
diff --git a/utils/lit/tests/discovery.py b/utils/lit/tests/discovery.py
index dbabeb39f19..9f09470c48c 100644
--- a/utils/lit/tests/discovery.py
+++ b/utils/lit/tests/discovery.py
@@ -29,7 +29,7 @@
 # RUN: %{python} %{inputs}/config-map-discovery/driver.py \
 # RUN:           %{inputs}/config-map-discovery/main-config/lit.cfg \
 # RUN:           %{inputs}/config-map-discovery/lit.alt.cfg \
-# RUN:           --single-process --debug --show-tests --show-suites > %t.out 2> %t.err
+# RUN:           --threads=1 --debug --show-tests --show-suites > %t.out 2> %t.err
 # RUN: FileCheck --check-prefix=CHECK-CONFIG-MAP-OUT < %t.out %s
 # RUN: FileCheck --check-prefix=CHECK-CONFIG-MAP-ERR < %t.err %s
 
-- 
2.11.0