diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-03-28 10:42:37 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-03-29 16:47:03 -0700 |
| commit | ba21f36282af29c74e53e5e36b14c613b7bd6866 (patch) | |
| tree | 60f4f294e805ec4626a6d14d79ca35687f16fee1 /test/partest | |
| parent | 00fcd46ed0ed3e981e241c8b5458ba821294c669 (diff) | |
| download | scala-ba21f36282af29c74e53e5e36b14c613b7bd6866.tar.gz scala-ba21f36282af29c74e53e5e36b14c613b7bd6866.tar.bz2 scala-ba21f36282af29c74e53e5e36b14c613b7bd6866.zip | |
Use java-diff-utils for diffing in partest.
We now use the unified diff format, hence the updated check files.
It's not clear to me how partest's classpath is managed,
but the approach in this commit works for the ant task and script invocation.
The diffutils jar is injected in the parent classloader.
Diffstat (limited to 'test/partest')
| -rwxr-xr-x | test/partest | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/partest b/test/partest index dd57137b21..57ca24a7a0 100755 --- a/test/partest +++ b/test/partest @@ -53,8 +53,8 @@ if [ -z "$EXT_CLASSPATH" ] ; then fi done elif [ -f "$SCALA_HOME/build/pack/lib/scala-partest.jar" ] ; then - for lib in `echo "partest library reflect compiler"`; do - ext="$SCALA_HOME/build/pack/lib/scala-$lib.jar" + for lib in `echo "scala-partest scala-library scala-reflect scala-compiler diffutils-1.3.0"`; do + ext="$SCALA_HOME/build/pack/lib/$lib.jar" if [ -z "$EXT_CLASSPATH" ] ; then EXT_CLASSPATH="$ext" else |