[m-rev.] trivial diff: disable check_namespace on eris

[Julien Fischer]

Disable the namespace cleanliness check when doing nightly builds on eris.
It currently fails because exported symbols on Darwin have an underscore
appended to them.

tools/test_mercury:
 	Disable the namespace cleanliness check on eris.

Julien.

Index: test_mercury
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.327
diff -u -r1.327 test_mercury
--- test_mercury	6 Dec 2007 06:34:40 -0000	1.327
+++ test_mercury	6 Dec 2007 08:10:43 -0000
@@ -695,6 +695,15 @@
  then
  	echo "$INSTALL_LIBGRADES" > .enable_lib_grades
  fi
+
+# XXX Darwin attachs an underscore to the names of exported symbols, so the 
+# namespace cleanliness check will fail if we perform it on that platform.
+namespace_opt=""
+case "$host" in
+    eris)
+    namespace_opt="--no-check-namespace"
+    ;;
+esac

  autoconf || { false; exit 1; }
  rm -f config.cache
@@ -706,7 +715,7 @@
  version=`$MMAKE $target_opts version` || { false; exit 1; }
  fullarch=`$MMAKE $target_opts fullarch` || { false; exit 1; }
  tools/bootcheck $USE_MMC_MAKE $use_cp_opt $target_opts \
-	--keep-objs --copy-runtime \
+	--keep-objs --copy-runtime $namespace_opt \
  	--no-test-suite $PARALLEL || $install_anyway || { false; exit 1; }
  cd .. || { false; exit 1; }


--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------