commit f2f924222a4ec748bdeab45c4de7d88ae477c594
author David Srbecky <dsrbecky@google.com> Fri May 21 10:38:36 2021 +0000
committer David Srbecky <dsrbecky@google.com> Sun Jun 06 12:51:56 2021 +0000
tree 13e29df6265fe8512ba1445977561eaf312e38e5
parent 579bfc8b7f08e4125129c9d3110b89d21f2ad26d

Revert "Reduce libcore parallelism for host"

This reverts commit 9d00bf1e0a9441153e69ea26c4cf111690a6e6a8.

Reason for revert: It didn't help. I hope the timeout increase helps instead.

Change-Id: I53aaf33a2e9db35bbc25acf89d08fc471e8f60e5

tools/run-libcore-tests.py

diff --git a/tools/run-libcore-tests.py b/tools/run-libcore-tests.py
index ba3c090..3ebee09 100755
--- a/tools/run-libcore-tests.py
+++ b/tools/run-libcore-tests.py
@@ -218,13 +218,7 @@
       raise AssertionError(f"Missing {jar}. Run buildbot-build.sh first.")
 
   if not args.jobs:
-    if args.mode == "device":
-      args.jobs = get_target_cpu_count()
-    else:
-      args.jobs = multiprocessing.cpu_count()
-      if args.gcstress:
-        # TODO: Investigate and fix the underlying issues.
-        args.jobs = args.jobs // 2
+    args.jobs = get_target_cpu_count() if args.mode == "device" else multiprocessing.cpu_count()
 
   def run_test(test_name):
     cmd = " ".join(get_vogar_command(test_name))