X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make-target-contrib.sh;h=85345e60bd9b731e896b1f3bf7960767a96a4d98;hb=19180214a7fd95ab467020469b7182f5ac62bcde;hp=78d6574fa7dfbd55323ce1f96f12856d0c10a60f;hpb=1acfa21e0796f5d72d776b0fd53645813d5f2d98;p=sbcl.git

diff --git a/make-target-contrib.sh b/make-target-contrib.sh
index 78d6574..85345e6 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
@@ -24,10 +26,14 @@ find_gnumake
 . ./sbcl-pwd.sh
 sbcl_pwd
 
-SBCL_HOME=$SBCL_PWD/contrib
+SBCL_HOME="$SBCL_PWD/contrib"
 export SBCL_HOME
+if [ "$OSTYPE" = "cygwin" ] ; then
+    SBCL_PWD=`echo $SBCL_PWD | sed s/\ /\\\\\\\\\ /g`
+fi
 
-SBCL="$SBCL_PWD/src/runtime/sbcl --noinform --core $SBCL_PWD/output/sbcl.core --disable-debugger --no-sysinit --no-userinit"
+SBCL="$SBCL_PWD/src/runtime/sbcl --noinform --core $SBCL_PWD/output/sbcl.core \
+--lose-on-corruption --disable-debugger --no-sysinit --no-userinit"
 SBCL_BUILDING_CONTRIB=1
 export SBCL SBCL_BUILDING_CONTRIB
 
@@ -49,11 +55,22 @@ find contrib/ \( -name '*.fasl' -o \
                  -name '*.O' \) \
   -print | xargs rm -f
 
+find output -name 'building-contrib.*' -print | xargs rm -f
+
+# Ignore all source registries.
+CL_SOURCE_REGISTRY='(:source-registry :ignore-inherited-configuration)'
+export CL_SOURCE_REGISTRY
+
 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
@@ -65,9 +82,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