# HG changeset patch
# User lana
# Date 1369249785 25200
# Node ID 7853cc17a828064e7e484adc3c2e4e9d8c4602bf
# Parent  c63d8676af01080015dc96bbcfd1a38c29cd65a0# Parent  b50b9139c47ea3b34e900fd981d2100a72d28ade
Merge

diff -r c63d8676af01 -r 7853cc17a828 jdk/test/Makefile
--- a/jdk/test/Makefile	Wed May 22 09:57:48 2013 -0700
+++ b/jdk/test/Makefile	Wed May 22 12:09:45 2013 -0700
@@ -657,9 +657,12 @@
 # Multiple by 4 the timeout numbers
 JTREG_TIMEOUT_OPTION =  -timeoutFactor:4
 JTREG_BASIC_OPTIONS += $(JTREG_TIMEOUT_OPTION)
-# Boost the max memory for jtreg to avoid gc thrashing
+# Set the max memory for jtreg control vm
 JTREG_MEMORY_OPTION = -J-Xmx512m
 JTREG_BASIC_OPTIONS += $(JTREG_MEMORY_OPTION)
+# Set the max memory for jtreg target test vms
+JTREG_TESTVM_MEMORY_OPTION = -vmoption:-Xmx512m
+JTREG_TEST_OPTIONS += $(JTREG_TESTVM_MEMORY_OPTION)
 
 # Make sure jtreg exists
 $(JTREG): $(JT_HOME)