X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make-target-contrib.sh;h=899c19ae5f5bd83d2e0759cc923cc091300cda26;hb=04d819bb1a2e64de4e997203b9516229bb73c686;hp=3095bc4868a2d5d7909992c93974462c54f7c6cd;hpb=63f5fdcb4b0450ad85cc41e867710304c044ff32;p=sbcl.git

diff --git a/make-target-contrib.sh b/make-target-contrib.sh
index 3095bc4..899c19a 100644
--- a/make-target-contrib.sh
+++ b/make-target-contrib.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 # This is a script to be run as part of make.sh. The only time you'd
 # probably want to run it by itself is if you're cross-compiling the
@@ -13,6 +14,13 @@
 # provided with absolutely no warranty. See the COPYING and CREDITS
 # files for more information.
 
+LANG=C
+LC_ALL=C
+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
@@ -24,7 +32,14 @@ SBCL="`pwd`/src/runtime/sbcl --noinform --core `pwd`/output/sbcl.core --userinit
 SBCL_BUILDING_CONTRIB=1
 export SBCL SBCL_BUILDING_CONTRIB
 
-gnumake=${GNUMAKE:-gmake}
+# deleting things here lets us not worry about interaction with stale
+# fasls.  This is not good, but is better than :FORCE on each asdf
+# operation, because that causes multiple builds of base systems such
+# as SB-RT and SB-GROVEL, but FIXME: there's probably a better
+# solution.  -- CSR, 2003-05-30
+
+find contrib/ \( -name '*.fasl' -o -name 'foo.c' -o -name 'a.out' -o -name 'alien.so' -o -name '*.o' \) \
+  -print | xargs rm -f
 
 mkdir -p contrib/systems
 rm -f contrib/systems/*
@@ -36,6 +51,22 @@ done
 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
+    test -f $i/test-passed && rm $i/test-passed
+    $GNUMAKE -C $i test && touch $i/test-passed
+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
+for dir in contrib/*
+do
+  if [ -d "$dir" -a -f "$dir/Makefile" -a ! -f "$dir/test-passed" ]; then
+      if $HEADER_HAS_BEEN_PRINTED; then
+          echo > /dev/null
+      else
+          echo "Failed contribs:"
+          HEADER_HAS_BEEN_PRINTED=true
+      fi
+      echo "  `basename $dir`"
+  fi
 done