changeset 41648:12f2a158f88b

8166738: Enable concurrency in Hotspot jtreg testing Reviewed-by: gtriantafill, erikj, sspitsyn
author ctornqvi
date Tue, 18 Oct 2016 06:14:35 -0400
parents aee906a791c6
children c732aa18f303 7c65b06a0b86
files test/Makefile
diffstat 1 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/test/Makefile	Thu Oct 13 08:57:52 2016 -0700
+++ b/test/Makefile	Tue Oct 18 06:14:35 2016 -0400
@@ -74,13 +74,14 @@
 jaxp_%:
 	@$(NO_STOPPING)$(call SUBDIR_TEST, $(JAXP_DIR), CONCURRENCY=$(JDK_TEST_JOBS) TEST="$@" $@)
 
-ifeq ($(TEST_JOBS), 0)
-  HOTSPOT_TEST_JOBS=1
-else
-  HOTSPOT_TEST_JOBS=$(TEST_JOBS)
+SUB_MAKE_ARGS :=
+ifneq ($(TEST_JOBS), 0)
+  ifneq ($(TEST_JOBS), )
+    SUB_MAKE_ARGS += CONCURRENCY=$(TEST_JOBS)
+  endif
 endif
 hotspot_%:
-	@$(NO_STOPPING)$(call SUBDIR_TEST, $(HOTSPOT_DIR), CONCURRENCY=$(HOTSPOT_TEST_JOBS) TEST="$@" $@)
+	@$(NO_STOPPING)$(call SUBDIR_TEST, $(HOTSPOT_DIR), $(SUB_MAKE_ARGS) TEST="$@" $@)
 
 #
 # jtreg_tests