[m-dev.] diff: run tests on ender

Fergus Henderson fjh at cs.mu.OZ.AU
Mon Oct 23 04:09:27 AEDT 2000


Estimated hours taken: 0.5

tools/run_all_tests_from_cron:
tools/test_mercury:
	- Add support for running tests on ender
	- Change the names of the binary distribution files for the
	  various linux platforms so that they include the optimization level.
	- Delete the hard-coded test which assumed that the file
	  system on `hg' doesn't support sym-links, since now it does.

Workspace: /home/pgrad/fjh/ws/hg
Index: tools/run_all_tests_from_cron
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/run_all_tests_from_cron,v
retrieving revision 1.21
diff -u -d -r1.21 run_all_tests_from_cron
--- tools/run_all_tests_from_cron	2000/09/22 07:44:21	1.21
+++ tools/run_all_tests_from_cron	2000/10/22 16:57:06
@@ -34,12 +34,13 @@
 	quicksilver) 	ARCH=i586	FULLARCH=i586-pc-linux-gnu ;;
 	hg) 		ARCH=i686	FULLARCH=i686-pc-linux-gnu ;;
 	hydra)		ARCH=i686	FULLARCH=i686-pc-linux-gnu ;;
+	ender)		ARCH=i686	FULLARCH=i686-pc-linux-gnu ;;
 	*)		echo "$0: unknown HOST $HOST" 1>&2; exit 1 ;;
 esac
 
 case $HOST in
 	kryten|taifun) 	mail="rsh mundook /bin/mail" ;;
-	hydra)		mail=/usr/bin/mail ;;
+	hydra|ender)	mail=/usr/bin/mail ;;
 	*)		mail=/bin/mail ;;
 esac
 
Index: tools/test_mercury
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.118
diff -u -d -r1.118 test_mercury
--- tools/test_mercury	2000/09/18 14:02:51	1.118
+++ tools/test_mercury	2000/10/22 16:53:46
@@ -58,20 +58,21 @@
 case $HOST in
 	# test things at different optimization levels...
 	murlibobo)	OPTIMIZE=-O5 ;;
-	kryten) 	OPTIMIZE=-O1 ;;
 	taifun) 	OPTIMIZE=-O1 ;;
-	rimmer) 	OPTIMIZE=-O1 ;;
 	quicksilver) 	OPTIMIZE=-O3 ;;
 	hg) 		OPTIMIZE=-O4 ;;
 	hydra)		OPTIMIZE=-O2 ;;
-	munta)		OPTIMIZE=-O0 ;;
+	ender)		OPTIMIZE=-O0 ;;
+	kryten) 	OPTIMIZE=-O1 ;;	# currently not used
+	rimmer) 	OPTIMIZE=-O1 ;; # currently not used
+	munta)		OPTIMIZE=-O0 ;; # dead
 esac
 
-# on hg, the file system we're using does not support links
-case $HOST in
-	hg)		LN="cp -r"; LN_S="cp -r" ;;
-	*)		LN="ln"; LN_S="ln -s" ;;
-esac
+# on some systems, the file system we're using does not support links
+#case $HOST in
+#	hg)		LN="cp -r"; LN_S="cp -r" ;;
+#	*)		LN="ln"; LN_S="ln -s" ;;
+#esac
 
 # flags for building the compiler
 INSTALL_MCFLAGS="$OPTIMIZE --opt-space"
@@ -145,7 +146,7 @@
 
 # version of the mercury compiler to use for bootstrapping
 case $HOST in
-	hg)
+	hg|ender)
 		BOOTSTRAP_MERCURY_COMPILER=/home/$HOST/public/mercury-latest/$FULLARCH/lib/mercury/bin/$FULLARCH/mercury_compile
 		;;
 	*)
@@ -219,6 +220,11 @@
 		# doesn't detect these problems, so we need to pass these
 		# options manually.
 		CONFIG_OPTS="--disable-extern-debug --disable-dynamic-link" ;;
+	ender)
+		# Test out these options, to make sure they continue
+		# to work
+		CONFIG_OPTS="--enable-hlc-grades \
+			--enable-new-mercuryfile-struct"
 	*)	
 		CONFIG_OPTS="" ;;
 esac
@@ -347,7 +353,7 @@
 		# requires --enable-all-grades
 		GRADES="asm_fast.gc.tr asm_fast.tr"
 		;;
-	hg|quicksilver|hydra|kryten|taifun)
+	hg|quicksilver|hydra|ender|kryten|taifun)
 		GRADES="asm_fast.gc.tr"
 		;;
 	*)
@@ -474,6 +480,13 @@
 			asm_fast.gc.memprof asm_fast.gc.tr asm_fast.gc.tr.debug
 			asm_fast.gc.par hlc.gc"
 		;;
+	ender)
+		GRADES="asm_fast.gc asm_fast
+			asm_fast.gc.prof asm_fast.prof
+			asm_fast.gc.memprof asm_fast.gc.tr asm_fast.gc.tr.debug
+			asm_fast.gc.par
+			hlc.gc hlc.gc.par hlc.gc.prof hlc.gc.memprof"
+		;;
 	quicksilver)
 		GRADES="asm_fast.gc asm_fast asm_fast.gc.tr.debug"
 		# Don't bother with these, otherwise it would take forever...
@@ -543,15 +556,20 @@
 
 # For the Linux systems, we need to distinguish them based
 # on the version of GNU libc.
+# Also we distinguish them based on what optimization level
+# they were compiled with.
 case $HOST in
 	hg)	
-		fullname=i686-pc-linux-libc2.1-gnu
+		fullname=i686-pc-linux-libc2.1-gnu-O4
 		;;
 	quicksilver)	
-		fullname=i586-pc-linux-libc2.1-gnu
+		fullname=i586-pc-linux-libc2.1-gnu-O3
 		;;
 	hydra)	
-		fullname=i686-pc-linux-libc2.0-gnu
+		fullname=i686-pc-linux-libc2.1-gnu-O2
+		;;
+	ender)	
+		fullname=i686-pc-linux-libc2.1-gnu-O0
 		;;
 	*)
 		fullname=$fullarch

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
                                    |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- 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
--------------------------------------------------------------------------



More information about the developers mailing list