[m-rev.] trivial diff: install asm_fast.gc.par on saturn and earth

[Julien Fischer]

Estimated hours taken: 0
Branches: main

Run the nightly tests in asm_fast.gc.par on saturn and earth.

tools/test_mercury:
	Remove stuff related to the machines we borrowed over summer.

	Install asm_fast.gc.par on saturn and earth.

tests/tabling/Mmakefile:
	Disable these tests in the lowlevel .par grades since tabling doesn't
	(currently) work properly in them.

Julien.

Index: tests/tabling/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/tabling/Mmakefile,v
retrieving revision 1.40
diff -u -r1.40 Mmakefile
--- tests/tabling/Mmakefile	13 Oct 2005 08:21:38 -0000	1.40
+++ tests/tabling/Mmakefile	8 Mar 2006 13:00:24 -0000
@@ -114,20 +114,32 @@
 # Tabling does not yet work in .rt grades
 ifneq "$(findstring .gc,$(GRADE))" ""
 	ifneq "$(findstring .rt,$(GRADE))" ""
-		PROGS=
+		PROGS0=
 		NONLOOP_PROGS=
 	else
 		ifneq "$(findstring mm,$(GRADE))" ""
-			PROGS=$(ALL_SIMPLE_PROGS) $(ALL_MINIMAL_PROGS)
+			PROGS0=$(ALL_SIMPLE_PROGS) $(ALL_MINIMAL_PROGS)
 			NONLOOP_PROGS=$(SIMPLE_NONLOOP_PROGS) \
 				$(MINIMAL_NONLOOP_PROGS)
 		else
-			PROGS=$(ALL_SIMPLE_PROGS)
+			PROGS0=$(ALL_SIMPLE_PROGS)
 			NONLOOP_PROGS=$(SIMPLE_NONLOOP_PROGS)
 		endif
 	endif
 else
-	PROGS=
+	PROGS0=
+endif
+
+# Tabling is buggy in the lowlevel .par grades so it's
+# disabled for now.
+ifeq "$(findstring .par,$(GRADE))" ""
+	PROGS=$(PROGS0)
+else
+	ifeq "$(findstring hl,$(GRADE))" ""
+		PROGS=
+	else
+		PROGS=$(PROGS0)
+	endif
 endif

 TESTS = $(PROGS)
Index: tools/test_mercury
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.286
diff -u -r1.286 test_mercury
--- tools/test_mercury	16 Feb 2006 03:00:07 -0000	1.286
+++ tools/test_mercury	8 Mar 2006 11:53:01 -0000
@@ -229,11 +229,6 @@
 	aral)		OPTIMIZE="-O3" ;;
 	ceres)		OPTIMIZE="-O5" ;;	# hlc
 	uranus)		OPTIMIZE="-O3" ;;
-	sophie)		OPTIMIZE="-O5 --intermodule-optimization" ;;
-	boadicea)	OPTIMIZE="-O4 --intermodule-optimization" ;;
-	surprise)	OPTIMIZE="-O3 --intermodule-optimization" ;;
-	lively)		OPTIMIZE="-O5 --intermodule-optimization" ;; # hlc
-	polychrest)	OPTIMIZE="-O4 --intermodule-optimization --introduce-accumulators" ;;
 esac

 # on some systems, the file system we're using does not support links
@@ -283,8 +278,6 @@
 case $HOST in
 	earth|ceres|aral|jupiter|swordfish|saturn|uranus)
 		INSTALL_DIR=/home/$HOST/public/$INSTALL_DIR_NAME/$FULLARCH ;;
-	sophie|boadicea|surprise|lively|polychrest)
-		INSTALL_DIR=/home/$HOST/public/$INSTALL_DIR_NAME/$FULLARCH ;;
 	*)
 		INSTALL_DIR=$TOPDIR/$INSTALL_DIR_NAME/$FULLARCH ;;
 esac
@@ -416,7 +409,8 @@
 					asm_fast.gc.mm		\
 					hlc.gc			\
 					hlc.gc.tr		\
-					hlc.par.gc		"
+					hlc.par.gc		\
+					asm_fast.gc.par"
 		;;
 	jupiter)
 		# Ensure that the nogc grades get installed and tested
@@ -425,15 +419,16 @@
 		;;
 	earth)
 		CONFIG_OPTS="--disable-dotnet-grades"
-		INSTALL_LIBGRADES="asm_fast.gc		\
-				asm_fast.gc.tr		\
-				asm_fast.gc.debug.tr 	\
-				asm_fast.gc.prof 	\
-				asm_fast.gc.profdeep 	\
-				asm_fast.gc.tsc 	\
-				hlc.gc 			\
-				hlc.par.gc		\
-				asm_fast.gc.tr.decldebug"
+		INSTALL_LIBGRADES="asm_fast.gc			\
+				asm_fast.gc.tr			\
+				asm_fast.gc.debug.tr 		\
+				asm_fast.gc.prof 		\
+				asm_fast.gc.profdeep 		\
+				asm_fast.gc.tsc	 		\
+				hlc.gc 				\
+				hlc.par.gc			\
+				asm_fast.gc.tr.decldebug	\
+				asm_fast.gc.par"
 		;;
 	aral)
 		#
@@ -483,61 +478,6 @@
 	uranus)
 		CONFIG_OPTS=""
 		;;
-
-	sophie)
-		CONFIG_OPTS=""
-		INSTALL_LIBGRADES="asm_fast.gc				\
-					asm_fast			\
-					asm_fast.gc.tr			\
-					asm_fast.gc.decldebug		\
-					hlc				\
-					hlc.gc				\
-					hl.gc				\
-					hl.gc.tr"
-		;;
-	boadicea)
-		CONFIG_OPTS=""
-		INSTALL_LIBGRADES="asm_fast.gc				\
-					hlc.gc				\
-					hlc.gc.tr			\
-					asm_fast.gc.tr.decldebug	\
-					asm_fast.gc.tr			\
-					asm_fast.gc.tr.prof		\
-					asm_fast.gc.tr.memprof		\
-					asm_fast.gc.tr.profdeep"
-		;;
-	surprise)
-		CONFIG_OPTS=""
-		INSTALL_LIBGRADES="asm_fast.gc		\
-					none		\
-					none.gc		\
-					none.gc.tr	\
-					none.gc.profdeep	\
-					none.gc.profdeep.tr"
-		;;
-	lively)
-		CONFIG_OPTS=""
-		DEFAULT_GRADE="hlc.gc"
-		export DEFAULT_GRADE
-		INSTALL_GRADE="hlc.gc"
-		INSTALL_LIBGRADES="hlc.gc.prof 		\
-					hlc		\
-					hlc.gc.tr 	\
-					hlc.gc.tr.prof	\
-					hlc.gc.tr.memprof \
-					hlc.par.gc	\
-					asm_fast.gc	\
-					asm_fast.gc.tr.debug"
-		;;
-	polychrest)
-		CONFIG_OPTS=""
-		INSTALL_LIBGRADES="asm_fast.gc	\
-					asm_fast.gc.tr.debug	\
-					hlc.gc			\
-					asm_fast.gc.mm		\
-					reg.gc.mm		\
-					none.gc.mm"
-		;;
 	*)
 		CONFIG_OPTS="" ;;
 esac

--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------