< prev index next >
make/RunTests.gmk
Print this page
rev 59102 : imported patch build
@@ -235,20 +235,10 @@
TEST_JOBS_FACTOR_JDL ?= 1
TEST_JOBS_FACTOR_MACHINE ?= 1
ifeq ($(TEST_JOBS), 0)
CORES_DIVIDER := 2
- ifeq ($(call isTargetCpuArch, sparc), true)
- # For smaller SPARC machines we see reasonable scaling of throughput up to
- # cpus/4 without affecting test reliability. On the bigger machines, cpus/4
- # causes intermittent timeouts.
- ifeq ($(shell $(EXPR) $(NUM_CORES) \> 16), 1)
- CORES_DIVIDER := 5
- else
- CORES_DIVIDER := 4
- endif
- endif
# For some big multi-core machines with low ulimit -u setting we hit the max
# threads/process limit. In such a setup the memory/cores-only-guided
# TEST_JOBS config is insufficient. From experience a concurrency setting of
# 14 works reasonably well for low ulimit values (<= 4096). Thus, use
# divider 4096/14. For high ulimit -u values this shouldn't make a difference.
@@ -841,16 +831,12 @@
# Make sure MaxRAMPercentage is high enough to not cause OOM or swapping since
# we may end up with a lot of JVM's
$1_JTREG_MAX_RAM_PERCENTAGE := $$(shell $$(EXPR) 25 / $$($1_JTREG_JOBS))
- # SPARC is in general slower per core so need to scale up timeouts a bit.
- ifeq ($(call isTargetCpuArch, sparc), true)
- JTREG_TIMEOUT_FACTOR ?= 8
- else
JTREG_TIMEOUT_FACTOR ?= 4
- endif
+
JTREG_VERBOSE ?= fail,error,summary
JTREG_RETAIN ?= fail,error
JTREG_RUN_PROBLEM_LISTS ?= false
JTREG_RETRY_COUNT ?= 0
< prev index next >