X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Fcore.test.sh;h=4f80be84e76feb4ed96f9b2874e9879796c76d02;hb=c2ac5ba3964165ee2d21ccd4c6bf8bdc48e1a165;hp=84c6a3da0c8cd5843afec453514460420d01e274;hpb=04d819bb1a2e64de4e997203b9516229bb73c686;p=sbcl.git

diff --git a/tests/core.test.sh b/tests/core.test.sh
index 84c6a3d..4f80be8 100644
--- a/tests/core.test.sh
+++ b/tests/core.test.sh
@@ -13,8 +13,12 @@
 # absolutely no warranty. See the COPYING and CREDITS files for
 # more information.
 
-tmpcore="core-test-sh-$$.core"
-rm -f $tmpcore
+. ./subr.sh
+
+use_test_subdirectory
+
+tmpcore=$TEST_FILESTEM.core
+tmpoutput=$TEST_FILESTEM.txt
 
 # In sbcl-0.7.7 SAVE-LISP-AND-DIE didn't work at all because of
 # flakiness caused by consing/GC/purify twice-and-at-least-twice
@@ -24,23 +28,17 @@ rm -f $tmpcore
 #   -- Eric Marsden, <http://tunes.org/~nef/logs/lisp/02.09.15>
 #
 # diagnosed and fixed by Dan Barlow in sbcl-0.7.7.29
-$SBCL <<EOF
+run_sbcl <<EOF
   (defun foo (x) (+ x 11))
   (save-lisp-and-die "$tmpcore")
 EOF
-$SBCL_ALLOWING_CORE --core "$tmpcore" \
---userinit /dev/null --sysinit /dev/null <<EOF
+run_sbcl_with_core "$tmpcore" --no-userinit --no-sysinit <<EOF
   (quit :unix-status (foo 10))
 EOF
-if [ $? = 21 ]; then
-    echo "/Basic SAVE-LISP-AND-DIE worked, good."
-else
-    echo "failure in basic SAVE-LISP-AND-DIE: $?"
-    exit 1
-fi
+check_status_maybe_lose "Basic SAVE-LISP-AND-DIE" $? 21 "(saved core ran)"
 
 # In sbcl-0.9.8 saving cores with callbacks didn't work on gencgc platforms
-$SBCL <<EOF
+run_sbcl <<EOF
   (defun bar ()
     (format t "~&Callbacks not supported, skipping~%")
     (quit :unix-status 42))
@@ -50,17 +48,35 @@ $SBCL <<EOF
     (defun bar () (quit :unix-status (alien-funcall foo))))
   (save-lisp-and-die "$tmpcore")
 EOF
-$SBCL_ALLOWING_CORE --core "$tmpcore" \
---userinit /dev/null --sysinit /dev/null <<EOF
+run_sbcl_with_core "$tmpcore" --no-userinit --no-sysinit <<EOF
   (bar)
 EOF
-if [ $? = 42 ]; then
-    echo "/Callbacks after SAVE-LISP-AND-DIE worked, good."
+check_status_maybe_lose "Callbacks after SAVE-LISP-AND-DIE" $? \
+    42 "(callback function ran)"
+
+# test suppression of banner in executable cores
+run_sbcl <<EOF
+  (save-lisp-and-die "$tmpcore" :executable t)
+EOF
+chmod u+x "$tmpcore"
+./"$tmpcore" > "$tmpoutput" --no-userinit --no-sysinit --noprint <<EOF 
+  (quit :unix-status 71)
+EOF
+status=$?
+if [ $status != 71 ]; then
+  echo "failure in banner suppression: $status"
+  exit 1
+elif [ -s "$tmpoutput" ]; then
+  echo "failure in banner suppression: nonempty output:"
+  echo ---
+  cat "$tmpoutput"
+  echo ---
+  exit 1
+elif [ -f "$tmpoutput" ]; then
+  echo "/Executable suppressed banner, good."
 else
-    echo "failure in basic SAVE-LISP-AND-DIE: $?"
-    exit 1
+  echo "failure in banner suppression: $tmpoutput was not created or something funny happened."
+  exit 1
 fi
 
-rm -f $tmpcore
-echo "/returning success from core.test.sh"
-exit 104
+exit $EXIT_TEST_WIN