[m-rev.] diff: disable ctgc tests in debug grades

Peter Wang novalazy at gmail.com
Tue Apr 22 14:41:10 AEST 2008


Estimated hours taken: 0.1
Branches: main

tests/hard_coded/Mmakefile:
tests/valid/Mmakefile:
	Disable testing of CTGC programs in debugging grades for now as it
	results in a compiler abort.

Index: hard_coded/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/hard_coded/Mmakefile,v
retrieving revision 1.346
diff -u -r1.346 Mmakefile
--- hard_coded/Mmakefile	21 Apr 2008 05:15:31 -0000	1.346
+++ hard_coded/Mmakefile	22 Apr 2008 01:02:14 -0000
@@ -10,9 +10,6 @@
 	agg \
 	array_test \
 	backquoted_qualified_ops \
-	bad_indirect_reuse \
-	bad_indirect_reuse2 \
-	bad_indirect_reuse3 \
 	bag_various \
 	bidirectional \
 	big_array_from_list \
@@ -351,6 +348,17 @@
 	TRACE_GOAL_ENV_PROGS=
 endif
 
+# Compile-time garbage collection is currently incompatible with debugging
+# grades.
+ifeq "$(findstring debug,$(GRADE))" ""
+	CTGC_PROGS= \
+		bad_indirect_reuse \
+		bad_indirect_reuse2 \
+		bad_indirect_reuse3
+else
+	CTGC_PROGS=
+endif
+
 # Tests of the C#, MC++, and IL foreign language interfaces only
 # work in IL grades
 ifeq "$(filter il%,$(GRADE))" ""
@@ -605,7 +613,8 @@
 		$(C_AND_GC_ONLY_PROGS) $(STATIC_LINK_PROGS) \
 		$(CHAR_REP_PROGS) $(C_ONLY_PROGS) \
 		$(DOTNET_PROGS) $(JAVA_PROGS) $(SOLVER_PROGS) \
-		$(TRAILED_PROGS) $(MUTABLE_PROGS) $(TRACE_GOAL_ENV_PROGS)
+		$(TRAILED_PROGS) $(MUTABLE_PROGS) $(TRACE_GOAL_ENV_PROGS) \
+		$(CTGC_PROGS)
 endif
 
 #-----------------------------------------------------------------------------#
Index: valid/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/valid/Mmakefile,v
retrieving revision 1.210
diff -u -r1.210 Mmakefile
--- valid/Mmakefile	17 Mar 2008 01:56:11 -0000	1.210
+++ valid/Mmakefile	22 Apr 2008 01:03:44 -0000
@@ -192,11 +192,9 @@
 	record_syntax_bug_5 \
 	recursive_no_tag_type \
 	reg_bug \
-	reuse_static \
 	same_length_2 \
 	semidet_disj \
 	shape_type \
-	sharing_exist \
 	simplify_bug \
 	simplify_bug2 \
 	size_prof_ho_bug \
@@ -268,6 +266,12 @@
 	par_dupelim \
 	par_saved_const
 
+# Compile-time garbage collection is currently incompatible with debugging
+# grades.
+CTGC_PROGS = \
+	reuse_static \
+	sharing_exist
+
 # The following programs require that num_tag_bits >= 1
 RESERVE_TAG_PROGS = \
 	reserve_tag
@@ -357,10 +361,16 @@
 	PROGS5 = $(PROGS4) $(PAR_CONJ_PROGS)
 endif
 
+ifeq "$(findstring debug,$(GRADE))"  ""
+	PROGS6 = $(PROGS5) $(CTGC_PROGS)
+else
+	PROGS6 = $(PROGS5)
+endif
+
 ifeq "$(filter java% il% erlang%,$(GRADE))" ""
-	OBJ_PROGS = $(PROGS5) $(RESERVE_TAG_PROGS)
+	OBJ_PROGS = $(PROGS6) $(RESERVE_TAG_PROGS)
 else
-	OBJ_PROGS = $(PROGS5)
+	OBJ_PROGS = $(PROGS6)
 endif
 
 ifneq "$(findstring tsw,$(GRADE))$(findstring tsc,$(GRADE))" ""


--------------------------------------------------------------------------
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
--------------------------------------------------------------------------



More information about the reviews mailing list