X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Frun-tests.sh;h=809ec8fb2ab72de337e5689e676701ce8bd4aadf;hb=71173fc4590389c52ac0e1abd75f79e417dad361;hp=de63a75cffd934c1c65a71328a7011e51b41f95d;hpb=cc1f30efe1c7438bfe6a413f16145ba2d63f7fe2;p=sbcl.git

diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index de63a75..809ec8f 100644
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -3,40 +3,60 @@
 # Run the regression tests in this directory.
 
 # how we invoke SBCL
-sbcl=${1:-sbcl --noinform --noprint --noprogrammer}
+sbcl=${1:-../src/runtime/sbcl --core ../output/sbcl.core --noinform --noprint --noprogrammer}
 
 # "Ten four" is the closest numerical slang I can find to "OK", so
-# it's the return value we expect from a successful test.
+# it's the return value that we expect from a successful test.
 tenfour () {
     if [ $? = 104 ]; then
 	echo ok
     else
 	echo test failed: $?
-	return 1
+	exit 1
     fi
 }
 
 # *.pure.lisp files are ordinary Lisp code with no side effects,
 # and we can run them all in a single Lisp process.
-(for f in *.pure.lisp; do echo \"$f\"; done) | $sbcl ; tenfour
+echo //running '*.pure.lisp' tests
+echo //i.e. *.pure.lisp
+(for f in *.pure.lisp; do
+    echo "(progn"
+    if [ -f $f ]; then
+        echo "  (progn (format t \"//running $f test~%\") (load \"$f\"))"
+    fi
+    echo "  (sb-ext:quit :unix-status 104))"
+done) | $sbcl ; tenfour
 
 # *.impure.lisp files are Lisp code with side effects (e.g. doing DEFSTRUCT
 # or DEFTYPE or DEFVAR). Each one needs to be run as a separate
 # invocation of Lisp.
+echo //running '*.impure.lisp' tests
 for f in *.impure.lisp; do
-    echo $f | $sbcl ; tenfour
+    if [ -f $f ]; then
+        echo //running $f test
+        echo "(load \"$f\")" | $sbcl ; tenfour
+    fi
 done
 
 # *.test.sh files are scripts to test stuff, typically stuff which can't
 # so easily be tested within Lisp itself. A file foo.test.sh
 # may be associated with other files foo*, e.g. foo.lisp, foo-1.lisp,
 # or foo.pl.
+echo //running '*.test.sh' tests
 for f in *.test.sh; do
-    sh $f ; tenfour
+    if [ -f $f ]; then
+	echo //running $f test
+	sh $f ; tenfour
+    fi
 done
 
 # *.assertoids files contain ASSERTOID statements to test things
 # interpreted and at various compilation levels.
+echo //running '*.assertoids' tests
 for f in *.assertoids; do
-    echo "(load \"$f\")" | $sbcl --eval '(load "assertoid.lisp")' ; tenfour
+    if [ -f $f ]; then
+	echo //running $f test
+	echo "(load \"$f\")" | $sbcl --eval '(load "assertoid.lisp")' ; tenfour
+    fi
 done