diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/files/run/constrained-types.scala | 5 | ||||
| -rwxr-xr-x | test/partest | 14 |
2 files changed, 13 insertions, 6 deletions
diff --git a/test/files/run/constrained-types.scala b/test/files/run/constrained-types.scala index 5f7eb7adde..91bd856d00 100644 --- a/test/files/run/constrained-types.scala +++ b/test/files/run/constrained-types.scala @@ -79,15 +79,12 @@ val x : Int @Where(self > 0 && self < 100) = 3 """ - override def settings: Settings = { - val s = new Settings - + override def transformSettings(s: Settings): Settings = { s.Xexperimental.value = true s.selfInAnnots.value = true s.deprecation.value = true // when running that compiler, give it a scala-library to the classpath s.classpath.value = sys.props("java.class.path") - s } } diff --git a/test/partest b/test/partest index 44f7130968..ebf6891fdc 100755 --- a/test/partest +++ b/test/partest @@ -74,7 +74,9 @@ if $cygwin; then EXT_CLASSPATH=`cygpath --path --$format "$EXT_CLASSPATH"` fi -[ -n "$JAVA_OPTS" ] || JAVA_OPTS="-Xmx1024M -Xms16M" +# last arg wins, so if JAVA_OPTS already contains -Xmx or -Xms the +# supplied argument will be used. +JAVA_OPTS="-Xmx1024M -Xms64M $JAVA_OPTS" [ -n "$SCALAC_OPTS" ] || SCALAC_OPTS="-deprecation" partestDebugStr="" @@ -82,4 +84,12 @@ if [ ! -z "${PARTEST_DEBUG}" ] ; then partestDebugStr="-Dpartest.debug=${PARTEST_DEBUG}" fi -${JAVACMD:=java} $JAVA_OPTS -cp "$EXT_CLASSPATH" ${partestDebugStr} -Dscala.home="${SCALA_HOME}" -Dpartest.javacmd="${JAVACMD}" -Dpartest.java_opts="${JAVA_OPTS}" -Dpartest.scalac_opts="${SCALAC_OPTS}" -Dpartest.javac_cmd="${JAVA_HOME}/bin/javac" scala.tools.partest.nest.NestRunner "$@" +${JAVACMD:=java} \ + $JAVA_OPTS -cp "$EXT_CLASSPATH" \ + ${partestDebugStr} \ + -Dscala.home="${SCALA_HOME}" \ + -Dpartest.javacmd="${JAVACMD}" \ + -Dpartest.java_opts="${JAVA_OPTS}" \ + -Dpartest.scalac_opts="${SCALAC_OPTS}" \ + -Dpartest.javac_cmd="${JAVA_HOME}/bin/javac" \ + scala.tools.partest.nest.NestRunner "$@" |