[m-rev.] diff: don't run tests/valid/par_dummy in decldebug grades

Julien Fischer juliensf at cs.mu.OZ.AU
Wed Apr 19 14:26:40 AEST 2006


We should probably be emitting a real error message for this rather than
an assertion failure in the compiler.  Another alternative would be to
have the decldebug grades treat parallel conjunction as normal
conjunction.

Estimated hours taken: 0.1
Branches: main, release

tests/valid/Mmakefile:
	Don't run tests/valid/par_dummy in decldebug grades, since using
	parallel conjunction in those grades causes an abort in the compiler.

Julien.

Index: Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/valid/Mmakefile,v
retrieving revision 1.171
diff -u -r1.171 Mmakefile
--- Mmakefile	18 Apr 2006 05:47:33 -0000	1.171
+++ Mmakefile	19 Apr 2006 04:22:42 -0000
@@ -162,7 +162,6 @@
 	no_warn_obsolete \
 	nondet_live \
 	overloading \
-	par_dummy \
 	parsing_bug_main \
 	pred_with_no_modes \
 	qualified_cons_id \
@@ -219,12 +218,18 @@
 DEEP_PROF_CAPABLE_PROGS = \
 	impure_detism

-	# These tests require debugging, which hasn't been
-	# implemented for the MLDS backend.
+# These tests require debugging, which hasn't been implemented for
+# the MLDS backend.
+#
 LLDS_PROGS= \
 	exists_cast_bug \
 	untuple_bug

+# These tests only work in grades that support parallel conjunction.
+#
+PAR_CONJ_PROGS = \
+	par_dummy
+
 # The following programs require that num_tag_bits >= 1
 RESERVE_TAG_PROGS = \
 	reserve_tag
@@ -307,9 +312,15 @@
 endif

 ifneq "$(findstring tsw,$(GRADE))$(findstring tsc,$(GRADE))" ""
-	PROGS = $(OBJ_PROGS)
+	PROGS5 = $(OBJ_PROGS)
+else
+	PROGS5 = $(OBJ_PROGS) $(IL_PROGS)
+endif
+
+ifneq "$(findstring decldebug,$(GRADE))" ""
+	PROGS = $(PROGS5)
 else
-	PROGS = $(OBJ_PROGS) $(IL_PROGS)
+	PROGS = $(PROGS5) $(PAR_CONJ_PROGS)
 endif

 # `mmc --make' doesn't expect subdirectories to appear in targets.

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



More information about the reviews mailing list