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

[Peter Wang]

On 2006-04-19, Julien Fischer <juliensf at cs.mu.OZ.AU> wrote:
> 
> 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.

There was a problem with this.  I've applied a fix to the main and
release branches.

Estimated hours taken: 0.2
Branches: main, release

tests/valid/Mmakefile:
	Fix the previous change to not run tests/valid/par_dummy in
	decldebug grades.

Index: Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/valid/Mmakefile,v
retrieving revision 1.172
diff -u -r1.172 Mmakefile
--- Mmakefile	19 Apr 2006 06:14:48 -0000	1.172
+++ Mmakefile	20 Apr 2006 03:52:36 -0000
@@ -305,22 +305,22 @@
 	PROGS4 = $(PROGS3)
 endif
 
-ifeq "$(filter java% il%,$(GRADE))" ""
-	OBJ_PROGS = $(PROGS4) $(RESERVE_TAG_PROGS)
+ifneq "$(findstring decldebug,$(GRADE))" ""
+	PROGS5 = $(PROGS4)
 else
-	OBJ_PROGS = $(PROGS4)
+	PROGS5 = $(PROGS4) $(PAR_CONJ_PROGS)
 endif
 
-ifneq "$(findstring tsw,$(GRADE))$(findstring tsc,$(GRADE))" ""
-	PROGS5 = $(OBJ_PROGS)
+ifeq "$(filter java% il%,$(GRADE))" ""
+	OBJ_PROGS = $(PROGS5) $(RESERVE_TAG_PROGS)
 else
-	PROGS5 = $(OBJ_PROGS) $(IL_PROGS)
+	OBJ_PROGS = $(PROGS5)
 endif
 
-ifneq "$(findstring decldebug,$(GRADE))" ""
-	PROGS = $(PROGS5)
+ifneq "$(findstring tsw,$(GRADE))$(findstring tsc,$(GRADE))" ""
+	PROGS = $(OBJ_PROGS)
 else
-	PROGS = $(PROGS5) $(PAR_CONJ_PROGS)
+	PROGS = $(OBJ_PROGS) $(IL_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
--------------------------------------------------------------------------