fixed MSIL tests (.dll not found)

4 files changed, 18 insertions, 10 deletions

diff --git a/src/library/scala/runtime/RichInt.scala b/src/library/scala/runtime/RichInt.scala
index f2fd48810a..df411d3c96 100644
--- a/src/library/scala/runtime/RichInt.scala
+++ b/src/library/scala/runtime/RichInt.scala
@@ -8,8 +8,10 @@
 
 // $Id$
 
+
 package scala.runtime
 
+
 final class RichInt(start: Int) extends Proxy with Ordered[Int] {
 
   // Proxy
diff --git a/src/library/scala/runtime/RichLong.scala b/src/library/scala/runtime/RichLong.scala
index 4a58b71e16..1f6d527170 100644
--- a/src/library/scala/runtime/RichLong.scala
+++ b/src/library/scala/runtime/RichLong.scala
@@ -18,7 +18,7 @@ final class RichLong(x: Long) extends Proxy with Ordered[Long] {
   def self: Any = x
 
   // Ordered[Long].compare
-  def compare (y: Long): Int = if (x < y) -1 else if (x > y) 1 else 0
+  def compare(y: Long): Int = if (x < y) -1 else if (x > y) 1 else 0
 
   def min(y: Long): Long = if (x < y) x else y
   def max(y: Long): Long = if (x > y) x else y
diff --git a/src/library/scala/runtime/RichShort.scala b/src/library/scala/runtime/RichShort.scala
index c9e3a120f7..9ae218342e 100644
--- a/src/library/scala/runtime/RichShort.scala
+++ b/src/library/scala/runtime/RichShort.scala
@@ -12,12 +12,12 @@
 package scala.runtime
 
 
-final class RichShort(x: Short) extends Proxy with Ordered[Short] {
+final class RichShort(start: Short) extends Proxy with Ordered[Short] {
 
   // Proxy.self
-  def self: Any = x
+  def self: Any = start
 
   // Ordered[Short].compare
-  def compare(y: Short): Int = if (x < y) -1 else if (x > y) 1 else 0
+  def compare(that: Short): Int = if (start < that) -1 else if (start > that) 1 else 0
 
 }
diff --git a/test/scalatest b/test/scalatest
index d1f4557df3..a5b61273c4 100755
--- a/test/scalatest
+++ b/test/scalatest
@@ -291,7 +291,7 @@ MSIL="msil"
 EXE="exe"
 # Tests the .NET backend.
 test_run_msil() {
-    assemblies=`get_os_pathlist $PREFIX/build/msil/predef.dll:$PREFIX/lib/scalaruntime.dll:$PREFIX/lib/mscorlib.dll`;
+    assemblies=`get_os_pathlist $LATEST_ASSEM`;
     rm -f "$dstbase".$MSIL &&
     rm -f "$dstbase".$EXE &&
 
@@ -607,15 +607,21 @@ if [ -d "$PREFIX/dists" ]; then
     LATEST="$PREFIX/dists/latest/bin";
     LATEST_LIB="$PREFIX/dists/latest/lib/scala-library.jar";
     LATEST_COMP="$PREFIX/dists/latest/lib/scala-compiler.jar";
+    LATEST_PREDEF="$PREFIX/dists/latest/lib/predef.dll";
+    LATEST_ASSEM="$LATEST_PREDEF;$PREFIX/lib/scalaruntime.dll:$PREFIX/lib/mscorlib.dll";
 elif [ -d "$PREFIX/build" ]; then
     LATEST="$QUICK";
     LATEST_LIB=$QUICK_LIB
     LATEST_COMP=$QUICK_COMP
     LATEST_ACT=$QUICK_ACT
+    LATEST_PREDEF="$PREFIX/build/quick/lib/predef.dll";
+    LATEST_ASSEM="$LATEST_PREDEF:$PREFIX/build/quick/lib/scalaruntime.dll:$PREFIX/build/quick/lib/mscorlib.dll";
 elif [ -d "$PREFIX/bin" ]; then
     LATEST="$PREFIX/bin";
-    LATEST_LIB="$PREFIX/lib/scala-library.jar"
-    LATEST_COMP="$PREFIX/lib/scala-compiler.jar"
+    LATEST_LIB="$PREFIX/lib/scala-library.jar";
+    LATEST_COMP="$PREFIX/lib/scala-compiler.jar";
+    LATEST_PREDEF="$PREFIX/lib/predef.dll";
+    LATEST_ASSEM="$LATEST_PREDEF:$PREFIX/lib/scalaruntime.dll:$PREFIX/lib/mscorlib.dll";
 else
     abort "Scala binaries could not be found";
 fi;
@@ -792,10 +798,10 @@ if [ $TEST_TYPE = "msil" ]; then
     printf_outline "ILasm version is    : $ilasm_version\\n";
     mono_version=`$MONO --version | head -1`;
     printf_outline "Mono version is     : $mono_version\\n";
-    if [ -f "$PREFIX/build/msil/predef.dll" ]; then
-        printf_outline "DLL library is      : $PREFIX/build/msil/predef.dll\\n";
+    if [ -f "$LATEST_PREDEF" ]; then
+        printf_outline "DLL library is      : $LATEST_PREDEF\\n";
     else
-        printf_failure "Missing library \"$PREFIX/build/msil/predef.dll\"; run 'ant msil'.\\n";
+        printf_failure "Missing library \"predef.dll\"; run 'ant msil'.\\n";
         exit 1;
     fi
 else