diff options
| author | Som Snytt <som.snytt@gmail.com> | 2012-08-30 15:17:58 -0700 |
|---|---|---|
| committer | Som Snytt <som.snytt@gmail.com> | 2012-08-31 11:13:28 -0700 |
| commit | 656a1c47c4fb2648a10296263133aa73e91061c9 (patch) | |
| tree | 73fe0c2fa7b3c43c5145e2811d4449df3204c32f /test/partest | |
| parent | c5d1cf09158e1e3c3b9821c6414406649a9d2f82 (diff) | |
| download | scala-656a1c47c4fb2648a10296263133aa73e91061c9.tar.gz scala-656a1c47c4fb2648a10296263133aa73e91061c9.tar.bz2 scala-656a1c47c4fb2648a10296263133aa73e91061c9.zip | |
On --grep, partest must dir.list to descend into subdirs (fixes SI-6296)
In addition, always use UTF-8 when reading test files (and not default),
since some tests exercise UTF-8.
Also, quote "$JAVACMD" and convert it (and $JAVA_HOME) for cygwin, where
$JAVACMD is likely to include a space.
Diffstat (limited to 'test/partest')
| -rwxr-xr-x | test/partest | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/test/partest b/test/partest index 8352f8a946..ae60c49929 100755 --- a/test/partest +++ b/test/partest @@ -70,6 +70,12 @@ if $cygwin; then else format=windows fi + if [ -n "${JAVA_HOME}" ] ; then + JAVA_HOME=`cygpath --$format "$JAVA_HOME"` + fi + if [ -n "${JAVACMD}" ] ; then + JAVACMD=`cygpath --$format "$JAVACMD"` + fi SCALA_HOME=`cygpath --$format "$SCALA_HOME"` EXT_CLASSPATH=`cygpath --path --$format "$EXT_CLASSPATH"` fi @@ -84,7 +90,7 @@ if [ ! -z "${PARTEST_DEBUG}" ] ; then partestDebugStr="-Dpartest.debug=${PARTEST_DEBUG}" fi -${JAVACMD:=java} \ +"${JAVACMD:=java}" \ $JAVA_OPTS -cp "$EXT_CLASSPATH" \ ${partestDebugStr} \ -Dscala.home="${SCALA_HOME}" \ |