Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8174895: test/TestCommon.gmk: value of JTREG_TESTVM_MEMORY_OPTION is missing
authorerikj
Thu, 16 Feb 2017 09:04:49 +0100
changeset 43780 314e36e4c783
parent 43779 0b3068c019e2
child 43781 a36b72c53986
8174895: test/TestCommon.gmk: value of JTREG_TESTVM_MEMORY_OPTION is missing Reviewed-by: dholmes, ihse
test/TestCommon.gmk file | annotate | diff | comparison | revisions 
--- a/test/TestCommon.gmk	Wed Feb 15 13:43:52 2017 -0800
+++ b/test/TestCommon.gmk	Thu Feb 16 09:04:49 2017 +0100
@@ -370,7 +370,7 @@
 # Give tests access to JT_JAVA, see JDK-8141609
 JTREG_BASIC_OPTIONS += -e:JDK8_HOME=${JT_JAVA}
 # Set other vm and test options
-JTREG_TEST_OPTIONS = $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_OPTIONS:%=-vmoption:%) $(JAVA_VM_ARGS:%=-vmoption:%)
+JTREG_TEST_OPTIONS += $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_OPTIONS:%=-vmoption:%) $(JAVA_VM_ARGS:%=-vmoption:%)
 
 ifeq ($(IGNORE_MARKED_TESTS), true)
   # Option to tell jtreg to not run tests marked with "ignore"
jdk-sandbox