more restrictive test naming

[sbcl.git] / make-target-contrib.sh

diff --git a/make-target-contrib.sh b/make-target-contrib.sh
index bcff011..b609072 100644 (file)
--- a/make-target-contrib.sh
+++ b/make-target-contrib.sh
@@ -18,7 +18,8 @@ echo //entering make-target-contrib.sh
 
 LANG=C
 LC_ALL=C
-export LANG LC_ALL
+CC=${CC:-gcc}
+export CC LANG LC_ALL
 
 # Load our build configuration
 . output/build-config
@@ -61,10 +62,10 @@ find output -name 'building-contrib.*' -print | xargs rm -f
 CL_SOURCE_REGISTRY='(:source-registry :ignore-inherited-configuration)'
 export CL_SOURCE_REGISTRY
 
-if [ -z "$@" ]; then
+if [ -z "$*" ]; then
     contribs_to_build=contrib/*
 else
-    for name in $@; do
+    for name in $*; do
         contribs_to_build="contrib/$name $contribs_to_build"
     done
 fi
@@ -81,6 +82,24 @@ for i in $contribs_to_build; 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