adapted script 'scalatest' to work in developme...

adapted script 'scalatest' to work in development AND end-user
environments

1 files changed, 10 insertions, 5 deletions

diff --git a/test/scalatest b/test/scalatest
index 090594dfa8..98593c6f03 100755
--- a/test/scalatest
+++ b/test/scalatest
@@ -211,9 +211,9 @@ test_run_neg() {
     rm -rf "$dstbase".obj &&
     mkdir -p "$dstbase".obj &&
     ( cd "$srcdir" && $SOCOS -d "$os_dstbase".obj "$@" "$testname".scala; );
-    status=$?;
+    if [ "$?" = 0 ]; then status=1; else status=0; fi;
     rm -rf "$dstbase".obj;
-    if [ "$status" = 0 ]; then return 1; else return 0; fi;
+    return $status;
 }
 
 # Tests the JVM backend.
@@ -455,8 +455,13 @@ FILES_POS="";
 FILES_NEG="";
 FILES_MSIL="";
 
-LATEST="$PREFIX/dists/latest/bin";
-QUICK="$PREFIX/build/quick/exec"
+if [ -d "$PREFIX/dists" ]; then
+    LATEST="$PREFIX/dists/latest/bin";
+    QUICK="$PREFIX/build/quick/exec"
+else
+    LATEST="$PREFIX/bin";
+    QUICK="$LATEST"
+fi;
 BIN_DIR="$LATEST"
 
 DIFF="diff";
@@ -545,7 +550,7 @@ test_check_all;
 
 TOTAL_COUNT=`echo "$FAILURE_COUNT+$SUCCESS_COUNT" | bc`;
 if [ $FAILURE_COUNT -eq 0 ]; then
-    printf_success "All $TOTAL_COUNT tests were successful\\n";
+    printf_success "All of $TOTAL_COUNT tests were successful\\n";
 else
     printf_failure "$FAILURE_COUNT of $TOTAL_COUNT tests failed\\n";
 fi;