changeset 24676:1db7e277df87

8043899: compiler/5091921/Test7005594.java fails if specified -Xmx is less than 1600m Reviewed-by: kvn, twisti, vlivanov
author iignatyev
date Wed, 28 May 2014 14:42:00 +0400
parents 8dd2c4604ff4
children db68f26d4f1b
files hotspot/test/compiler/5091921/Test7005594.java hotspot/test/compiler/5091921/Test7005594.sh
diffstat 2 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/test/compiler/5091921/Test7005594.java	Tue May 27 16:05:29 2014 -0700
+++ b/hotspot/test/compiler/5091921/Test7005594.java	Wed May 28 14:42:00 2014 +0400
@@ -25,7 +25,6 @@
 /**
  * @test
  * @bug 7005594
- * @ignore 7117034
  * @summary Array overflow not handled correctly with loop optimzations
  *
  * @run shell Test7005594.sh
--- a/hotspot/test/compiler/5091921/Test7005594.sh	Tue May 27 16:05:29 2014 -0700
+++ b/hotspot/test/compiler/5091921/Test7005594.sh	Wed May 28 14:42:00 2014 +0400
@@ -78,7 +78,7 @@
 
 ${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} -d . Test7005594.java
 
-${TESTJAVA}/bin/java ${TESTVMOPTS} -Xms1600m -XX:+IgnoreUnrecognizedVMOptions -XX:-ZapUnusedHeapArea -Xcomp -XX:CompileOnly=Test7005594.test Test7005594 > test.out 2>&1
+${TESTJAVA}/bin/java ${TESTVMOPTS} -Xmx1600m -Xms1600m -XX:+IgnoreUnrecognizedVMOptions -XX:-ZapUnusedHeapArea -Xcomp -XX:CompileOnly=Test7005594.test Test7005594 > test.out 2>&1
 
 result=$?
 
@@ -97,7 +97,7 @@
 fi
 
 # The test should pass when no enough space for object heap
-grep "Could not reserve enough space for object heap" test.out
+grep "Could not reserve enough space for .*object heap" test.out
 if [ $? = 0 ]
 then
   echo "Passed"