aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/testsuite/libjava.jacks/jacks.exp7
2 files changed, 11 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index f719593..3cb21bd 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-25 Ranjit Mathew <rmathew@hotmail.com>
+
+ * testsuite/libjava.jacks/jacks.exp (gcj_jacks_write): Explicitly
+ limit the maximum heap size to avoid unnecessary thrashing.
+
2004-04-24 Jerry Quinn <jlquinn@optonline.net>
* java/text/CollationElementIterator.java (reset): Reset
diff --git a/libjava/testsuite/libjava.jacks/jacks.exp b/libjava/testsuite/libjava.jacks/jacks.exp
index 353859c..679c7f5 100644
--- a/libjava/testsuite/libjava.jacks/jacks.exp
+++ b/libjava/testsuite/libjava.jacks/jacks.exp
@@ -28,7 +28,12 @@ proc gcj_jacks_write {filename} {
puts $fd "set JAVA_CLASSPATH \"$libgcj_jar\""
puts $fd "set JAVAC_FLAGS [list $rest]"
puts $fd "set JAVA [list [libjava_find_gij]]"
- puts $fd "set JAVA_FLAGS \"\""
+
+ # Without an explicit limit on the heap size, tests depending on
+ # an OutOfMemoryError (e.g. "15.9.4-runtime-creation-2") can result
+ # in a lot of unnecessary thrashing.
+ puts $fd "set JAVA_FLAGS \"-mx=64m\""
+
puts $fd "set JAVAC_ENCODING_FLAG --encoding="
puts $fd "set tcltest::testConstraints(encoding) 1"
puts $fd "set tcltest::testConstraints(gcj) 1"