[m-rev.] diff: speed up mmake --use-mmc-make clean in test dirs

[Peter Wang]

Branches: main

scripts/Mmake.rules:
        Speed up `mmake --use-mmc-make clean' and `realclean' in the test
        directories by calling `mmc --make' once for all the clean targets
        instead of individually.

tests/hard_coded/Mmakefile:
        Disable trans_intermod_user_equality test case when using mmc --make
        as it requires --transitive-intermodule-optimisation.

diff --git a/scripts/Mmake.rules b/scripts/Mmake.rules
index fc315df..ec9d71c 100644
--- a/scripts/Mmake.rules
+++ b/scripts/Mmake.rules
@@ -406,8 +406,11 @@ $(ALL_MC_BUILD_FILES) %.err:
 .DEFAULT:
 	$(MCM) $@

-clean_local: $(MERCURY_MAIN_MODULES:%=%.clean)
-realclean_local: $(MERCURY_MAIN_MODULES:%=%.realclean)
+clean_local:
+	$(MCM) $(MERCURY_MAIN_MODULES:%=%.clean)
+
+realclean_local:
+	$(MCM) $(MERCURY_MAIN_MODULES:%=%.realclean)

 endif # $(MMAKE_USE_MMC_MAKE) == yes

diff --git a/tests/hard_coded/Mmakefile b/tests/hard_coded/Mmakefile
index 11ee75c..ab64a7d 100644
--- a/tests/hard_coded/Mmakefile
+++ b/tests/hard_coded/Mmakefile
@@ -241,7 +241,6 @@ ORDINARY_PROGS=	\
 	trace_goal_1 \
 	trace_goal_2 \
 	trace_goal_3 \
-	trans_intermod_user_equality \
 	transform_value \
 	transitive_inst_type \
 	trigraphs \
@@ -270,6 +269,12 @@ ORDINARY_PROGS=	\
 	write_xml \
 	xmlable_test

+# --transitive-intermodule-optimization is incompatible with mmc --make.
+ifneq ($(MMAKE_USE_MMC_MAKE),yes)
+ORDINARY_PROGS += \
+	trans_intermod_user_equality
+endif
+
 # JAVA_PASS_PROGS lists those tests which will succeed in grade Java.

 JAVA_PASS_PROGS= \
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------