[m-rev.] diff: nightly tests on neptune and pluto

[Julien Fischer]

Estimated hours taken: 0.5
Branches: main

tools/test_mercury:
 	Add sets of grades to install on neptune and pluto.

 	Reduce the number of grades that saturn builds.

 	Enable parallel builds on saturn and pluto.

 	Delete the comment about parallel builds not working;
 	they do now.

Julien.

Index: test_mercury
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.312
diff -u -r1.312 test_mercury
--- test_mercury	19 Jan 2007 07:07:26 -0000	1.312
+++ test_mercury	22 Jan 2007 03:09:07 -0000
@@ -222,6 +222,8 @@
  			;;
  	earth)		OPTIMIZE="-O2" ;;
  	saturn)		OPTIMIZE="-O5 --intermodule-optimization" ;;
+	neptune)	OPTIMIZE="-O4" ;;
+	pluto)		OPTIMIZE="-O2 --intermodule-optimization" ;;
  	$G12_ROTD_HOST|swordfish)
  		case $BRANCH in
  			g12) OPTIMIZE="-O3" ;;
@@ -296,12 +298,10 @@

  # $PARALLEL: flag to pass to GNU make for parallel make
  #
-# XXX we should be able to do parallel builds on saturn
-# but support for parallel builds seems to be broken 
-# at the moment.
  PARALLEL=
  case $HOST in
-	*)		PARALLEL= ;;
+	saturn|pluto)		PARALLEL="-j2" ;;
+	*)			PARALLEL= ;;
  esac

  # Version of the mercury compiler to use for bootstrapping
@@ -394,14 +394,42 @@
  					asm_fast.gc.prof	\
  					asm_fast.gc.tr		\
  					asm_fast.gc.tr.debug	\
-					asm_fast.gc.mm		\
-					asm_fast.gc.profdeep	\
  					asm_fast.gc.tr.profdeep	\
  					hlc.gc			\
  					hlc.gc.tr		\
  					hlc.par.gc		\
  					asm_fast.par.gc"
-		;; 
+		;;
+	neptune)
+		CONFIG_OPTS=""
+		INSTALL_LIBGRADES="
+			asm_fast.gc			\
+			asm_fast.gc.tr			\
+			asm_fast.gc.tr.debug		\
+			hlc.gc				\
+			hlc.gc.tr			\
+			hlc.gc.tr.ll_debug		\
+			asm_fast.gc.tr.prof		\
+			asm_fast.gc.tr.memprof		\
+			asm_fast.gc.tr.profdeep" 
+		;; 
+	pluto)
+		DEFAULT_GRADE="hlc.gc"
+		export DEFAULT_GRADE
+		INSTALL_GRADE="hlc.gc"
+		CONFIG_OPTS=""
+		INSTALL_LIBGRADES="
+			hlc.gc				\
+			hlc.gc.tr			\
+			hlc.par.gc			\
+			asm_fast.gc			\
+			asm_fast.par.gc			\
+			asm_fast.gc.tr			\
+			asm_fast.gc.tr.debug		\
+			asm_fast.gc.profdeep		\
+			reg.gc.tr" 
+		;;
+
  	jupiter)
  		# Ensure that the nogc grades get installed and tested
  		# on at least one host
@@ -935,7 +963,13 @@
  		fullname=i686-pc-linux-libc2.3-gnu-O3
  		;;
  	saturn)
-		fullname=x86_64-unknown-linux-gnu-libc2.3
+		fullname=x86_64-unknown-linux-gnu-libc2.3-gnu-O5-intermod
+		;;
+	neptune)
+		fullname=x86_64-unknown-linux-gnu-libc2.3-gnu-O4
+		;;
+	pluto)
+		fullname=x86_64-unknown-linux-gnu-libc2.3-gnu-O2-intermod-hlc
  		;;
  	*)
  		fullname=$fullarch
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------