[llvm] r354073 - [lit] Remove --single-process option (use -j1 instead)
Julian Lettner via llvm-commits
llvm-commits at lists.llvm.org
Thu Feb 14 14:46:57 PST 2019
Author: yln
Date: Thu Feb 14 14:46:56 2019
New Revision: 354073
URL: http://llvm.org/viewvc/llvm-project?rev=354073&view=rev
Log:
[lit] Remove --single-process option (use -j1 instead)
Remove `--single-process` command line option. Use `-j1` instead.
Also see commit: 96adb78b120b6aa9739eb714534dc8e819f7bc52
Modified:
llvm/trunk/utils/lit/lit/main.py
llvm/trunk/utils/lit/tests/discovery.py
Modified: llvm/trunk/utils/lit/lit/main.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/lit/main.py?rev=354073&r1=354072&r2=354073&view=diff
==============================================================================
--- llvm/trunk/utils/lit/lit/main.py (original)
+++ llvm/trunk/utils/lit/lit/main.py Thu Feb 14 14:46:56 2019
@@ -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)
Modified: llvm/trunk/utils/lit/tests/discovery.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/tests/discovery.py?rev=354073&r1=354072&r2=354073&view=diff
==============================================================================
--- llvm/trunk/utils/lit/tests/discovery.py (original)
+++ llvm/trunk/utils/lit/tests/discovery.py Thu Feb 14 14:46:56 2019
@@ -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
More information about the llvm-commits
mailing list