[m-rev.] diff: disable string_hash test in non-GC grades

Simon Taylor stayl at cs.mu.OZ.AU
Sat Nov 23 02:34:56 AEDT 2002


Estimated hours taken: 0.25
Branches: main, release

tests/hard_coded/Mmakefile:
	The string_hash test requires a significant amount of
	memory, so don't run it in non-GC grades.

Index: Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/Mmakefile,v
retrieving revision 1.173.2.2
diff -u -u -r1.173.2.2 Mmakefile
--- Mmakefile	22 Nov 2002 14:10:52 -0000	1.173.2.2
+++ Mmakefile	22 Nov 2002 15:28:06 -0000
@@ -264,10 +264,11 @@
 endif
 
 # string_hash tests features of the Mercury C runtime.
-ifeq "$(filter il% java%,$(GRADE))" ""
-	C_ONLY_PROGS=string_hash
+# It requires too much memory to be used in non-GC grades.
+ifeq "$(filter il% java%,$(GRADE))$(findstring gc,$(GRADE))" "gc"
+	C_AND_GC_ONLY_PROGS=string_hash
 else
-	C_ONLY_PROGS=
+	C_AND_GC_ONLY_PROGS=
 endif	
 
 # Static linking doesn't work on Solaris in debug grades
@@ -280,7 +281,7 @@
 
 PROGS = $(ORDINARY_PROGS) $(BROKEN_FOR_LCC_PROGS) $(CLOSURE_LAYOUT_PROGS) \
 	$(EXCEPTION_PROGS) $(BACKEND_PROGS) $(NONDET_C_PROGS) \
-	$(C_ONLY_PROGS) $(STATIC_LINK_PROGS) $(CHAR_REP_PROGS)
+	$(C_AND_GC_ONLY_PROGS) $(STATIC_LINK_PROGS) $(CHAR_REP_PROGS)
 
 # --split-c-files does not work in the hl* grades (e.g. hlc.gc),
 # because it hasn't yet been implemented yet.
--------------------------------------------------------------------------
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