--- a/make/RunTests.gmk	Wed Nov 29 23:28:21 2017 +0100
+++ b/make/RunTests.gmk	Wed Nov 29 23:34:29 2017 +0100
@@ -338,9 +338,9 @@
 	         -jdk $(JDK_IMAGE_DIR) $$($1_GTEST_FILTER) \
 	         --gtest_output=xml:$$($1_TEST_RESULTS_DIR)/gtest.xml \
 	         $$($1_GTEST_REPEAT) $$(GTEST_OPTIONS) $$(GTEST_VM_OPTIONS) \
-	        > >($(TEE) $$($1_TEST_RESULTS_DIR)/gtest.txt) && \
-	    $$(ECHO) $$$$? > $$($1_EXITCODE) ||
-	    $$(ECHO) $$$$? > $$($1_EXITCODE) \
+	        > >($(TEE) $$($1_TEST_RESULTS_DIR)/gtest.txt) \
+	    && $$(ECHO) $$$$? > $$($1_EXITCODE) \
+	    || $$(ECHO) $$$$? > $$($1_EXITCODE) \
 	)
 
   $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/gtest.txt
@@ -512,9 +512,9 @@
 	        -workDir:$$($1_TEST_SUPPORT_DIR) \
 	        $$(JTREG_OPTIONS) \
 	        $$(JTREG_FAILURE_HANDLER_OPTIONS) \
-	        $$($1_TEST_NAME) && \
-	    $$(ECHO) $$$$? > $$($1_EXITCODE) ||
-	    $$(ECHO) $$$$? > $$($1_EXITCODE) \
+	        $$($1_TEST_NAME) \
+	    && $$(ECHO) $$$$? > $$($1_EXITCODE) \
+	    || $$(ECHO) $$$$? > $$($1_EXITCODE) \
 	)
 
   $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/text/stats.txt

--- a/make/RunTestsPrebuilt.gmk	Wed Nov 29 23:28:21 2017 +0100
+++ b/make/RunTestsPrebuilt.gmk	Wed Nov 29 23:34:29 2017 +0100
@@ -85,12 +85,12 @@
 # $1: The output file name
 # $2..$N: The lines to output to the file
 define CreateNewSpec
-  $(if $(strip $(16)), \
+  $(if $(strip $(26)), \
     $(error Internal makefile error: \
       Too many arguments to macro, please update CreateNewSpec in RunTestsPrebuilt.gmk) \
   ) \
   $(shell rm -f $1) \
-  $(foreach i, 2 3 4 5 6 7 8 9 10 11 12 13 14 15, \
+  $(foreach i, 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25, \
     $(if $(strip $($i)), \
       $(call AppendFile, $(strip $($i)), $1) \
     ) \