[m-dev.] diff: fix bug in changes to tests

[Mark Anthony BROWN]

I introduced these bugs with my recent changes to the tests.

- Mark.


Estimated hours taken: 0.5

Fix bugs that were stopping *.res and *.out files being cleaned up properly.

tests/Mmake.common:
tests/general/accumulator/Mmakefile:
tests/invalid/Mmakefile:
tests/misc_tests/Mmakefile:
tests/tabling/Mmakefile:
tests/term/Mmakefile:
tests/valid/Mmakefile:
tests/warnings/Mmakefile:
	Make cleaning tasks depend on (real)clean_local rather than
	(real)clean.  This is because tests/startup and tests/shutdown
	use the *_local targets.

tests/general/Mmakefile:
	Fix bugs in the recursive mmake calls.

Index: tests/Mmake.common
===================================================================
RCS file: /home/mercury1/repository/tests/Mmake.common,v
retrieving revision 1.14
diff -u -r1.14 Mmake.common
--- Mmake.common	1999/07/12 06:24:57	1.14
+++ Mmake.common	1999/07/14 13:45:28
@@ -35,7 +35,7 @@
 
 #-----------------------------------------------------------------------------#
 
-clean: clean_out clean_res
+clean_local: clean_out clean_res
 
 clean_mc: clean_c clean_o clean_out clean_res
 
Index: tests/general/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/general/Mmakefile,v
retrieving revision 1.25
diff -u -r1.25 Mmakefile
--- Mmakefile	1999/07/12 06:25:32	1.25
+++ Mmakefile	1999/07/14 13:53:52
@@ -117,32 +117,32 @@
 
 check_subdirs:
 	for dir in $(SUBDIRS); do \
-		(cd $$dir && $(SUBDIR_MMAKE) check_subdirs) || exit 1; \
+		(cd $$dir && $(SUBDIR_MMAKE) check) || exit 1; \
 	done
 
 dep_subdirs:
 	for dir in $(SUBDIRS); do \
-		(cd $$dir && $(SUBDIR_MMAKE) dep_subdirs) || exit 1; \
+		(cd $$dir && $(SUBDIR_MMAKE) dep) || exit 1; \
 	done
 
 depend_subdirs:
 	for dir in $(SUBDIRS); do \
-		(cd $$dir && $(SUBDIR_MMAKE) depend_subdirs) || exit 1; \
+		(cd $$dir && $(SUBDIR_MMAKE) depend) || exit 1; \
 	done
 
 realclean_subdirs:
 	for dir in $(SUBDIRS); do \
-		(cd $$dir && $(SUBDIR_MMAKE) realclean_subdirs) || exit 1; \
+		(cd $$dir && $(SUBDIR_MMAKE) realclean) || exit 1; \
 	done
 
 clean_subdirs:
 	for dir in $(SUBDIRS); do \
-		(cd $$dir && $(SUBDIR_MMAKE) clean_subdirs) || exit 1; \
+		(cd $$dir && $(SUBDIR_MMAKE) clean) || exit 1; \
 	done
 
 all_subdirs:
 	for dir in $(SUBDIRS); do \
-		(cd $$dir && $(SUBDIR_MMAKE) all_subdirs) || exit 1; \
+		(cd $$dir && $(SUBDIR_MMAKE) all) || exit 1; \
 	done
 
 #-----------------------------------------------------------------------------#
Index: tests/general/accumulator/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/general/accumulator/Mmakefile,v
retrieving revision 1.1
diff -u -r1.1 Mmakefile
--- Mmakefile	1999/06/16 06:19:16	1.1
+++ Mmakefile	1999/07/14 13:50:56
@@ -54,7 +54,7 @@
 
 all:	$(PROGS)
 
-realclean: clean_hlds_dump
+realclean_local: clean_hlds_dump
 
 clean_hlds_dump:
 	-rm -f *hlds_dump*
Index: tests/invalid/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/invalid/Mmakefile,v
retrieving revision 1.44
diff -u -r1.44 Mmakefile
--- Mmakefile	1999/07/14 07:15:35	1.44
+++ Mmakefile	1999/07/14 13:48:30
@@ -118,7 +118,7 @@
 depend:	aditi_update_errors.depend aditi_update_mode_errors.depend \
 		test_nested.depend partial_implied_mode.depend
 
-clean:
+clean_local:
 	rm -f *.err *.err_res
 
 #-----------------------------------------------------------------------------#
Index: tests/misc_tests/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/misc_tests/Mmakefile,v
retrieving revision 1.11
diff -u -r1.11 Mmakefile
--- Mmakefile	1999/04/17 08:08:10	1.11
+++ Mmakefile	1999/07/14 14:54:43
@@ -37,7 +37,7 @@
 
 all:	$(PROGS)
 
-clean:	clean_ugly
+clean_local:	clean_ugly
 
 clean_ugly:
 	rm -fr *.ugly
Index: tests/tabling/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/tabling/Mmakefile,v
retrieving revision 1.7
diff -u -r1.7 Mmakefile
--- Mmakefile	1999/04/30 04:17:49	1.7
+++ Mmakefile	1999/07/14 14:59:41
@@ -69,8 +69,8 @@
 
 all:	$(PROGS)
 
-clean:
+clean_local:
 
-realclean:
+realclean_local:
 
 #-----------------------------------------------------------------------------#
Index: tests/term/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/term/Mmakefile,v
retrieving revision 1.11
diff -u -r1.11 Mmakefile
--- Mmakefile	1998/10/02 20:12:58	1.11
+++ Mmakefile	1999/07/14 13:47:05
@@ -90,10 +90,10 @@
 
 check: $(TRANS_OPT_RESS)
 
-clean:
+clean_local:
 	rm -f *.trans_opt_err
 
-realclean:
+realclean_local:
 	rm -f *.trans_opt_res
 
 #-----------------------------------------------------------------------------#
Index: tests/valid/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/valid/Mmakefile,v
retrieving revision 1.36
diff -u -r1.36 Mmakefile
--- Mmakefile	1999/07/13 08:55:27	1.36
+++ Mmakefile	1999/07/14 15:03:56
@@ -199,7 +199,7 @@
 printobjs:
 	@echo $(OBJS)
 
-clean:
+clean_local:
 	rm -f *.err *.h
 
 #-----------------------------------------------------------------------------#
Index: tests/warnings/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/warnings/Mmakefile,v
retrieving revision 1.5
diff -u -r1.5 Mmakefile
--- Mmakefile	1999/06/23 04:17:56	1.5
+++ Mmakefile	1999/07/14 15:04:35
@@ -45,7 +45,7 @@
 
 all:	$(PROGS)
 
-clean:	clean_err clean_res
+clean_local:	clean_err clean_res
 
 clean_mc: clean_c clean_o clean_err clean_res
 
-- 
Mark Brown, PhD student            )O+  |  "Another of Fortran's breakthroughs
(m.brown at cs.mu.oz.au)                   |  was the GOTO statement, which was...
Dept. of Computer Science and Software  |  uniquely simple and understandable"
Engineering, University of Melbourne    |              -- IEEE, 1994
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------