X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make-target-contrib.sh;h=249a0140def9704e6a7dab4e49e4a554bd728aa2;hb=2e498cbcb062ff8b6e21703838e214c6427bffe8;hp=6d10ca3d3561e46d5d394edb74f0e8c1718c323b;hpb=2365c1b81d99c8e8e34665052f5b47be5cd6cd74;p=sbcl.git

diff --git a/make-target-contrib.sh b/make-target-contrib.sh
index 6d10ca3..249a014 100644
--- a/make-target-contrib.sh
+++ b/make-target-contrib.sh
@@ -14,6 +14,8 @@ set -e
 # provided with absolutely no warranty. See the COPYING and CREDITS
 # files for more information.
 
+echo //entering make-target-contrib.sh
+
 LANG=C
 LC_ALL=C
 export LANG LC_ALL
@@ -21,20 +23,13 @@ export LANG LC_ALL
 . ./find-gnumake.sh
 find_gnumake
 
-# usually SBCL_HOME refers to the installed root of SBCL, not the
-# build directory.  Right now, however, where there are dependencies
-# between contrib packages, we want the _uninstalled_ versions to be
-# found
-if [ "$OSTYPE" = "cygwin" ] ; then
-    SBCL_BASE=`cygpath -m $(pwd)`
-else
-    SBCL_BASE=`pwd`
-fi
-SBCL_HOME=$SBCL_BASE/contrib
-export SBCL_HOME
+. ./sbcl-pwd.sh
+sbcl_pwd
 
+SBCL_HOME=$SBCL_PWD/contrib
+export SBCL_HOME
 
-SBCL="$SBCL_BASE/src/runtime/sbcl --noinform --core $SBCL_BASE/output/sbcl.core --disable-debugger --no-sysinit --no-userinit"
+SBCL="$SBCL_PWD/src/runtime/sbcl --noinform --core $SBCL_PWD/output/sbcl.core --disable-debugger --no-sysinit --no-userinit"
 SBCL_BUILDING_CONTRIB=1
 export SBCL SBCL_BUILDING_CONTRIB
 
@@ -56,11 +51,18 @@ find contrib/ \( -name '*.fasl' -o \
                  -name '*.O' \) \
   -print | xargs rm -f
 
+find output -name 'building-contrib.*' -print | xargs rm -f
+
 for i in contrib/*; do
     test -d $i && test -f $i/Makefile || continue;
     # export INSTALL_DIR=$SBCL_HOME/`basename $i `
     test -f $i/test-passed && rm $i/test-passed
-    $GNUMAKE -C $i test && touch $i/test-passed
+    # hack to get exit codes right.
+    if $GNUMAKE -C $i test 2>&1 && touch $i/test-passed ; then
+	:
+    else
+	exit $?
+    fi | tee output/building-contrib.`basename $i` 
 done
 
 # Sometimes people used to see the "No tests failed." output from the last
@@ -72,9 +74,17 @@ do
       if $HEADER_HAS_BEEN_PRINTED; then
           echo > /dev/null
       else
-          echo "Failed contribs:"
+          cat <<EOF
+
+WARNING! Some of the contrib modules did not build successfully or pass
+their self-tests. Failed contribs:"
+EOF
           HEADER_HAS_BEEN_PRINTED=true
       fi
       echo "  `basename $dir`"
   fi
 done
+
+if [ $HEADER_HAS_BEEN_PRINTED = true ]; then
+  exit 1
+fi