added variable JAVA_OPTS to the generated Unix ...

added variable JAVA_OPTS to the generated Unix tools

1 files changed, 21 insertions, 9 deletions

diff --git a/test/scalatest b/test/scalatest
index 56dc169f02..9a87774b59 100755
--- a/test/scalatest
+++ b/test/scalatest
@@ -332,7 +332,7 @@ test_run_shootout() {
     $SCALAC -d "$os_dstbase".obj -cp "$JVM_EXT_CLASSPATH" "$@" "$dstbase".obj/test.scala &&
     scala_lib=`get_os_filename "$SCALA_LIB"` &&
     classpath=`get_os_pathlist "$os_dstbase".obj:$CLASSPATH` &&
-    $SCALA -Dscalatest.cwd=$srcdir -Dscalatest.output=$os_dstbase.obj -Dscalatest.lib=$scala_lib -classpath $classpath:$JVM_EXT_CLASSPATH Test  &&
+    env JAVACMD="$JAVACMD $JAVA_OPTS" $SCALA -Dscalatest.cwd=$srcdir -Dscalatest.output=$os_dstbase.obj -Dscalatest.lib=$scala_lib -classpath $classpath:$JVM_EXT_CLASSPATH Test  &&
     rm -rf "$dstbase".obj;
 }
 
@@ -608,10 +608,13 @@ fi;
 BIN_DIR="$LATEST/"  # BIN_DIR should have a trailing / when needed, so that
                     # it can also be set to the empty string
 
-SCALA_LIB="$LATEST_LIB"
+SCALA_LIB="$LATEST_LIB";
 
-case `${JAVACMD:=java} \-version 2>&1 | head -1` in
+[ -x "$JAVACMD" ] || JAVACMD=java;
+[ -n "$JAVA_OPTS" ] || JAVA_OPTS="-Xmx256M -Xms16M";
+case `$JAVACMD \-version 2>&1 | head -1` in
     *1.5*) JAVA5="true";;
+    *1.6*) JAVA5="true"; JAVA_OPTS="$JAVA_OPTS -Xss32m";;
         *) JAVA5="false";;
 esac;
 
@@ -709,11 +712,13 @@ if [ "$TEST_ALL" = "true" ]; then
 fi;
 
 SCALA="${BIN_DIR}scala";
+SCALAC_OPTS="-deprecation -encoding iso-8859-1";
 if [ "$USEFSC" = "true" ]; then
-    SCALAC="${BIN_DIR}fsc -deprecation -encoding iso-8859-1";
+    SCALAC_CMD="${BIN_DIR}fsc";
 else
-    SCALAC="${BIN_DIR}scalac -deprecation -encoding iso-8859-1";
+    SCALAC_CMD="${BIN_DIR}scalac";
 fi;
+SCALAC="$SCALAC_CMD $SCALAC_OPTS";
 SCALAP="scalap";
 ANT="ant";
 
@@ -728,14 +733,21 @@ fi
 printf_outline "Source directory is : $SRCDIR\\n";
 bin_dir=$BIN_DIR
 if [ -z "$bin_dir" ]; then
-    scalac=`which $SCALAC`;
+    scalac=`which $SCALAC_CMD`;
     bin_dir=`test_get_location $scalac`;
 fi;
 printf_outline "Scala binaries in   : $bin_dir\\n";
-scala_version=`${SCALAC} -version 2>&1`
+scala_version=`${SCALAC_CMD} -version 2>&1`
 printf_outline "Scala version is    : $scala_version\\n";
-jvm_version=`${JAVACMD:=java} -version 2>&1 | head -3 | tail -1`
-printf_outline "Java runtime is     : $jvm_version\\n\\n";
+[ -n "$SCALAC_OPTS" ] && printf_outline "Scalac options are  : $SCALAC_OPTS\\n";
+
+javacmd=`which $JAVACMD`;
+bin_dir=`test_get_location $javacmd`;
+printf_outline "Java binaries in    : $bin_dir\\n";
+jvm_version=`$JAVACMD -version 2>&1 | head -3 | tail -1`
+printf_outline "Java runtime is     : $jvm_version\\n";
+[ -n "$JAVA_OPTS" ] && printf_outline "Java options are    : $JAVA_OPTS\\n";
+printf_outline "\\n";
 
 test_check_all;