diff options
| author | Philipp Haller <hallerp@gmail.com> | 2008-10-21 19:04:52 +0000 |
|---|---|---|
| committer | Philipp Haller <hallerp@gmail.com> | 2008-10-21 19:04:52 +0000 |
| commit | baa6f58f76e697d98336ce4ef2dbc71c7e0fccc7 (patch) | |
| tree | c2d612d994191969c889de4b6b42ac3e59d3ff70 /test | |
| parent | 4c9ef158c68d2add782d81ae490e8e32f2cc1b83 (diff) | |
| download | scala-baa6f58f76e697d98336ce4ef2dbc71c7e0fccc7.tar.gz scala-baa6f58f76e697d98336ce4ef2dbc71c7e0fccc7.tar.bz2 scala-baa6f58f76e697d98336ce4ef2dbc71c7e0fccc7.zip | |
Changed the way in which the path to javac is p...
Changed the way in which the path to javac is passed to partest.
Diffstat (limited to 'test')
| -rwxr-xr-x | test/partest | 2 | ||||
| -rwxr-xr-x | test/partest.bat | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/partest b/test/partest index 88729ac8c6..339f1fe792 100755 --- a/test/partest +++ b/test/partest @@ -74,4 +74,4 @@ fi [ -n "$JAVA_OPTS" ] || JAVA_OPTS="-Xmx256M -Xms16M" [ -n "$SCALAC_OPTS" ] || SCALAC_OPTS="-deprecation" -${JAVACMD:=java} $JAVA_OPTS -cp "$EXT_CLASSPATH" -Dpartest.debug="${PARTEST_DEBUG}" -Dscala.home="${SCALA_HOME}" -Dscalatest.javacmd="${JAVACMD}" -Dscalatest.java_opts="${JAVA_OPTS}" -Dscalatest.scalac_opts="${SCALAC_OPTS}" scala.tools.partest.nest.NestRunner "$@" +${JAVACMD:=java} $JAVA_OPTS -cp "$EXT_CLASSPATH" -Dpartest.debug="${PARTEST_DEBUG}" -Dscala.home="${SCALA_HOME}" -Dscalatest.javacmd="${JAVACMD}" -Dscalatest.java_opts="${JAVA_OPTS}" -Dscalatest.scalac_opts="${SCALAC_OPTS}" -Dscalatest.javac_cmd="${JAVA_HOME}/bin/javac" scala.tools.partest.nest.NestRunner "$@" diff --git a/test/partest.bat b/test/partest.bat index 8b01e03c7f..098553fad8 100755 --- a/test/partest.bat +++ b/test/partest.bat @@ -53,7 +53,7 @@ if "%_EXTENSION_CLASSPATH%"=="" ( )
)
-set _PROPS=-Dscala.home="%_SCALA_HOME%" -Dscalatest.javacmd="%_JAVACMD%" -Dscalatest.java_options="%_JAVA_OPTS%" -Dscalatest.scalac_options="%_SCALAC_OPTS%"
+set _PROPS=-Dscala.home="%_SCALA_HOME%" -Dscalatest.javacmd="%_JAVACMD%" -Dscalatest.java_options="%_JAVA_OPTS%" -Dscalatest.scalac_options="%_SCALAC_OPTS%" -Dscalatest.javac_cmd="%JAVA_HOME%\bin\javac"
rem echo %_JAVACMD% %_JAVA_OPTS% %_PROPS% -cp "%_EXTENSION_CLASSPATH%" scala.tools.partest.nest.NestRunner %_ARGS%
%_JAVACMD% %_JAVA_OPTS% %_PROPS% -cp "%_EXTENSION_CLASSPATH%" scala.tools.partest.nest.NestRunner %_ARGS%
|