diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2007-07-20 12:47:09 +0000 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2007-07-20 12:47:09 +0000 |
| commit | 0f1add0d0b95fd6807b4de8a6df642b66512a295 (patch) | |
| tree | c049534d76d20617c251dc039f3984b445a9b9a2 /test | |
| parent | 444991fd00e4592cca2f76280ae9f53aa1815005 (diff) | |
| download | scala-0f1add0d0b95fd6807b4de8a6df642b66512a295.tar.gz scala-0f1add0d0b95fd6807b4de8a6df642b66512a295.tar.bz2 scala-0f1add0d0b95fd6807b4de8a6df642b66512a295.zip | |
fixed scalatest so that check files for jvm tes...
fixed scalatest so that check files for jvm tests are
filesystem-location-independent
Diffstat (limited to 'test')
| -rw-r--r-- | test/files/jvm5/annotations.check | 8 | ||||
| -rwxr-xr-x | test/scalatest | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/test/files/jvm5/annotations.check b/test/files/jvm5/annotations.check index 918109b42f..03c57ee59b 100644 --- a/test/files/jvm5/annotations.check +++ b/test/files/jvm5/annotations.check @@ -1,13 +1,13 @@ -/Users/adriaan/src/scala/trunk/test/files/jvm5/annotations.scala:133: warning: type Integer in object Predef is deprecated +annotations.scala:133: warning: type Integer in object Predef is deprecated private var count: Integer = 0 ^ -/Users/adriaan/src/scala/trunk/test/files/jvm5/annotations.scala:138: warning: type Integer in object Predef is deprecated +annotations.scala:138: warning: type Integer in object Predef is deprecated getClass().getMethod("setCount", Array[java.lang.Class](classOf[Integer])) ^ -/Users/adriaan/src/scala/trunk/test/files/jvm5/annotations.scala:140: warning: type Integer in object Predef is deprecated +annotations.scala:140: warning: type Integer in object Predef is deprecated def get = getter.invoke(this, Array()).asInstanceOf[Integer].intValue ^ -/Users/adriaan/src/scala/trunk/test/files/jvm5/annotations.scala:141: warning: type Integer in object Predef is deprecated +annotations.scala:141: warning: type Integer in object Predef is deprecated def set(n: Int) = setter.invoke(this, Array(new Integer(n))) ^ four warnings found diff --git a/test/scalatest b/test/scalatest index f74b63aec8..14f8f38584 100755 --- a/test/scalatest +++ b/test/scalatest @@ -264,8 +264,8 @@ test_run_jvm() { fi rm -rf "$dstbase".obj && mkdir -p "$dstbase".obj && - env JAVACMD="$JAVACMD" JAVA_OPTS="$javaopts" $SCALAC -d "$os_dstbase".obj \ - -cp "$JVM_EXT_CLASSPATH" "$@" "$os_srcbase".scala && + (cd "$srcdir" && env JAVACMD="$JAVACMD" JAVA_OPTS="$javaopts" $SCALAC -d "$os_dstbase".obj \ + -cp "$JVM_EXT_CLASSPATH" "$@" "$testname".scala ) && libpath=`get_os_pathlist "$dstdir"` && scala_javaopts=`echo -Djava.library.path=$libpath` && scala_lib=`get_os_filename "$SCALA_LIB"` && |