[m-dev.] diff: update tools/test_mercury

Fergus Henderson fjh at cs.mu.OZ.AU
Wed Oct 27 01:37:32 AEST 1999
Previous message: [m-dev.] diff: add more tests of user-defined equality
Next message: [m-dev.] diff: update papers web page
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
tools/test_mercury:
tools/run_all_test_from_cron:
	Several changes:
		- fix a typo (missing backslash)
		- build the tests using shared libraries on Linux,
		  to reduce disk usage
		- for the Linux versions, name the final tar file 
		  based on the version of libc being used
		- on kryten, use only 2 CPUs, since kryten has
		  only got 3 CPUs now
		- on munta, use the `--disable-extern-debug' option
		  to configure
		- various changes to handle tests on hg

Workspace: /home/mercury/public/test_mercury
cvs diff: Diffing .
Index: run_all_tests_from_cron
===================================================================
RCS file: /home/staff/zs/imp/mercury/tools/run_all_tests_from_cron,v
retrieving revision 1.16
diff -u -d -u -r1.16 run_all_tests_from_cron
--- run_all_tests_from_cron	1999/09/15 15:40:24	1.16
+++ run_all_tests_from_cron	1999/10/20 12:27:22
@@ -86,11 +86,15 @@
 	echo last 10 lines of log file:
 	tail -10 $logfile
 	echo
-	cd /home/mercury/public/mercury-latest/$FULLARCH/lib/mercury/bin/$FULLARCH
+	case $HOST in
+		hg) base=/home/hg ;;
+		*) base=/home/mercury ;;
+	esac
+	cd $base/public/mercury-latest/$FULLARCH/lib/mercury/bin/$FULLARCH
 	ls -l mercury_compile
 	size mercury_compile
 	{
-		echo $FULLARCH
+		echo $FULLARCH $HOST
 		ls -l mercury_compile
 		size mercury_compile
 		echo
Index: test_mercury
===================================================================
RCS file: /home/staff/zs/imp/mercury/tools/test_mercury,v
retrieving revision 1.100
diff -u -d -u -r1.100 test_mercury
--- test_mercury	1999/10/06 00:13:49	1.100
+++ test_mercury	1999/10/26 15:35:34
@@ -18,6 +18,7 @@
 PATH="$HOME/bin/$ARCH`awk '/^[^#]/{printf ":%s",$0;}' /home/pgrad/fjh/.path`"
 PATH="/home/mercury/public/mercury-0.8/$FULLARCH/bin:$PATH"
 PATH="/home/mercury/public/mercury-latest/$FULLARCH/bin:$PATH"
+PATH="/home/$HOST/public/mercury-latest/$FULLARCH/bin:$PATH"
 PATH="/home/mercury/public/nuprolog/$FULLARCH/bin:$PATH"
 PATH="/home/mercury/public/gcc-2.7.2/$FULLARCH/bin:$PATH"
 PATH="/home/mercury/public/egcs-1.1b/$FULLARCH/bin:$PATH"
@@ -73,6 +74,21 @@
 TEST_MCFLAGS="$OPTIMIZE --opt-space"
 TEST_CFLAGS=""
 
+case $FULLARCH in
+	i?86-*-linux*)
+		# On x86 Linux, we need to set the following flags to enable
+		# shared libraries (and we need to use shared libraries to
+		# avoid running out of disk space...)
+		TEST_MGNUCFLAGS=--pic-reg
+		TEST_MLFLAGS=--shared
+		;;
+	*)
+		# On other platforms shared libraries is the default
+		TEST_MGNUCFLAGS=""
+		TEST_MLFLAGS=""
+		;;
+esac
+
 # directories to use
 
 TESTDIR=/home/mercury/public/test_mercury
@@ -105,7 +121,7 @@
 # $PARALLEL: flag to pass to GNU make for parallel make
 PARALLEL=
 case $HOST in
-	kryten) 	PARALLEL=-j3 ;; # out of four CPUs
+	kryten) 	PARALLEL=-j2 ;; # out of three CPUs
 	rimmer) 	PARALLEL=-j2 ;; # out of two CPUs
 	muse)		PARALLEL=-j2 ;; # out of four CPUs
 	munta)		PARALLEL=-j2 ;; # out of four CPUs
@@ -118,7 +134,14 @@
 esac
 
 # version of the mercury compiler to use for bootstrapping
-BOOTSTRAP_MERCURY_COMPILER=/home/mercury/public/mercury-latest/$FULLARCH/lib/mercury/bin/$FULLARCH/mercury_compile
+case $HOST in
+	hg)
+		BOOTSTRAP_MERCURY_COMPILER=/home/$HOST/public/mercury-latest/$FULLARCH/lib/mercury/bin/$FULLARCH/mercury_compile
+		;;
+	*)
+		BOOTSTRAP_MERCURY_COMPILER=/home/mercury/public/mercury-latest/$FULLARCH/lib/mercury/bin/$FULLARCH/mercury_compile
+		;;
+esac
 
 # df (disk free) command
 DF=df
@@ -167,20 +190,24 @@
 
 case $HOST in
 	murlibobo)
-		CONFIG_OPTS=--enable-all-grades ;;
+		CONFIG_OPTS="--enable-all-grades" ;;
 	kryten)		
-		CONFIG_OPTS=--enable-all-grades ;;
+		# On kryten & taifun, there is a bug in readline which causes
+		# it to go into an infinite loop when reading from a file.
+		CONFIG_OPTS="--enable-all-grades --without-readline" ;;
 	taifun)		
-		# On taifun, there is a bug in readline which causes
-		# it to go into an infinite loop when reading from
-		# a file.
-		CONFIG_OPTS=--without-readline ;;
+		# On kryten & taifun, there is a bug in readline which causes
+		# it to go into an infinite loop when reading from a file.
+		CONFIG_OPTS="--without-readline" ;;
 	munta)		
 		# On munta, we need to disable the external debugger,
 		# because it uses sockets, and munta doesn't have
 		# the static versions of the socket libraries
-		# installed.
-		CONFIG_OPTS=--disable-extern-debug ;;
+		# installed.  Likewise for the -non_shared version
+		# of the dl library.  Unfortunately our configure script
+		# doesn't detect these problems, so we need to pass these
+		# options manually.
+		CONFIG_OPTS="--disable-extern-debug --disable-dynamic-link" ;;
 	*)	
 		CONFIG_OPTS="" ;;
 esac
@@ -283,7 +310,7 @@
 		#
 		(cd library && \
 		\
-		PATH=../scripts:../util:$PATH 
+		PATH=../scripts:../util:$PATH \
 		MMAKE_VPATH=. MMAKE_DIR=../scripts \
 		../scripts/mmake EXTRA_CFLAGS="$TEST_CFLAGS -O1" \
 		int.dir/*.o && \
@@ -470,6 +497,7 @@
 do
 	echo "test_mercury starting tests for grade $grade at `date`" 1>&2
 	./runtests -f "$TEST_MCFLAGS" -c "$TEST_CFLAGS" -g "$grade" \
+		-m "$TEST_MGNUCFLAGS" -l "$TEST_MLFLAGS" \
 		$PARALLEL || status=1
 	case $grade in
 		*.memprof*)
@@ -513,24 +541,42 @@
 
 : build the binary distribution
 
+# For the Linux systems, we need to distinguish them based
+# on the version of GNU libc.
+case $HOST in
+	hg)	
+		fullname=i686-pc-linux-libc2.1-gnu
+		;;
+	quicksilver)	
+		fullname=i586-pc-linux-libc2.0-gnu
+		;;
+	hydra)	
+		fullname=i686-pc-linux-libc2.0-gnu
+		;;
+	*)
+		fullname=$fullarch
+		;;
+esac
+
 {
 	cd $DIR/mercury &&
 	mmake bindist &&
 	cd .. &&
 	( [ -d $UNSTABLE ] || mkdir $UNSTABLE ) &&
-	rm -f $UNSTABLE/mercury-*.$fullarch.tar.gz &&
-	mv mercury/mercury-$version.$fullarch.tar.gz $UNSTABLE
+	rm -f $UNSTABLE/mercury-*.$fullname.tar.gz &&
+	mv mercury/mercury-$version.$fullarch.tar.gz \
+		$UNSTABLE/mercury-$version.$fullname.tar.gz
 } || status=1
 
 case $status in
     0) {
     	cd $DIR &&
 	( [ -d $STABLE ] || mkdir $STABLE ) &&
-	rm -f $STABLE/mercury-*.$fullarch.tar.gz &&
-	$LN $UNSTABLE/mercury-$version.$fullarch.tar.gz $STABLE &&
-	rsh $BETA_FTPHOST "rm -f $BETA_FTPDIR/mercury-*.$fullarch.tar.gz" &&
-	rcp $STABLE/mercury-$version.$fullarch.tar.gz \
-		$BETA_FTPHOST:$BETA_FTPDIR 
+	rm -f $STABLE/mercury-*.$fullname.tar.gz &&
+	$LN $UNSTABLE/mercury-$version.$fullname.tar.gz $STABLE &&
+	rsh $BETA_FTPHOST "rm -f $BETA_FTPDIR/mercury-*.$fullname.tar.gz" &&
+	rcp $STABLE/mercury-$version.$fullname.tar.gz \
+		$BETA_FTPHOST:$BETA_FTPDIR
        } || status=1
     ;;
 esac

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
WWW: <http://www.cs.mu.oz.au/~fjh>  |  of excellence is a lethal habit"
PGP: finger fjh at 128.250.37.3        |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------
Previous message: [m-dev.] diff: add more tests of user-defined equality
Next message: [m-dev.] diff: update papers web page
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the developers mailing list