X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make-target-contrib.sh;h=b6090724b5b1b105c94d10e62736baecb1939c1b;hb=56b6d13d2758753d18a7413aa14ea25d025cf13e;hp=249a0140def9704e6a7dab4e49e4a554bd728aa2;hpb=34eaed1bd3f131629f1329e2196cb4422ee735ca;p=sbcl.git

diff --git a/make-target-contrib.sh b/make-target-contrib.sh
index 249a014..b609072 100644
--- a/make-target-contrib.sh
+++ b/make-target-contrib.sh
@@ -18,18 +18,23 @@ echo //entering make-target-contrib.sh
 
 LANG=C
 LC_ALL=C
-export LANG LC_ALL
+CC=${CC:-gcc}
+export CC LANG LC_ALL
 
-. ./find-gnumake.sh
-find_gnumake
+# Load our build configuration
+. output/build-config
 
 . ./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
 
@@ -53,7 +58,19 @@ find contrib/ \( -name '*.fasl' -o \
 
 find output -name 'building-contrib.*' -print | xargs rm -f
 
-for i in contrib/*; do
+# Ignore all source registries.
+CL_SOURCE_REGISTRY='(:source-registry :ignore-inherited-configuration)'
+export CL_SOURCE_REGISTRY
+
+if [ -z "$*" ]; then
+    contribs_to_build=contrib/*
+else
+    for name in $*; do
+        contribs_to_build="contrib/$name $contribs_to_build"
+    done
+fi
+
+for i in $contribs_to_build; 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
@@ -65,6 +82,24 @@ for i in contrib/*; do
     fi | tee output/building-contrib.`basename $i` 
 done
 
+# Otherwise report expected failures:
+HEADER_HAS_BEEN_PRINTED=false
+for dir in contrib/*; do
+  f="$dir/test-passed"
+  if test -f "$f" && grep -i fail "$f" >/dev/null; then
+      if ! $HEADER_HAS_BEEN_PRINTED; then
+          cat <<EOF
+
+Note: Test suite failures which are expected for this combination of
+platform and features have been ignored:
+EOF
+          HEADER_HAS_BEEN_PRINTED=true
+      fi
+      echo "  $dir"
+      (unset IFS; while read line; do echo "    $line"; done <"$f")
+  fi
+done
+
 # Sometimes people used to see the "No tests failed." output from the last
 # DEFTEST in contrib self-tests and think that's all that is. So...
 HEADER_HAS_BEEN_PRINTED=false