From fb69294bc773888f9c580716fd733b9856b87cd0 Mon Sep 17 00:00:00 2001 From: Zoltan Somogyi Date: Mon, 17 Nov 2025 11:30:38 +1100 Subject: [PATCH] Put entries into lexicographic order. --- tests/declarative_debugger/Mmakefile | 129 +++++++++++++-------------- 1 file changed, 63 insertions(+), 66 deletions(-) diff --git a/tests/declarative_debugger/Mmakefile b/tests/declarative_debugger/Mmakefile index 1a4d16b3c..cae6f1554 100644 --- a/tests/declarative_debugger/Mmakefile +++ b/tests/declarative_debugger/Mmakefile @@ -11,7 +11,7 @@ MAYBE_J1 = -j1 #-----------------------------------------------------------------------------# -DECLARATIVE_PROGS = \ +BASE_PROGS = \ aadebug \ all_trusted \ app \ @@ -84,14 +84,12 @@ DECLARATIVE_PROGS = \ unsafe_cast # The following should not be run in `debug' or `mm' grades. -# -NONDEBUG_DECLARATIVE_PROGS= \ +NONDEBUG_PROGS = \ untraced_subgoal -# The following should only be run when the library is compiled in -# decldebug grade. -# -DECLDEBUG_DECLARATIVE_PROGS= \ +# The following should only be run when the library is compiled +# in a decldebug grade. +DECLDEBUG_PROGS = \ builtin_call_rep \ catch_retry \ condition_bug \ @@ -101,11 +99,10 @@ DECLDEBUG_DECLARATIVE_PROGS= \ typed_unify # The following should not be run in decldebug grades. -# -NONDECLDEBUG_DECLARATIVE_PROGS= \ +NONDECLDEBUG_PROGS = \ shallow -NONWORKING_DECLARATIVE_PROGS= \ +NONWORKING_PROGS = \ io_read_bug # Some of the test cases require a different input in debug or decldebug @@ -119,35 +116,33 @@ NONWORKING_DECLARATIVE_PROGS= \ # but can use the same input for the debug and decldebug grades should use the # DEBUG_INP variable and use the extensions .inp and .inp2 for their non-debug # and debug/decldebug input files respectively. -# ifneq "$(findstring .debug,$(GRADE))" "" - PROGS_2 = $(DECLARATIVE_PROGS) $(NONDECLDEBUG_DECLARATIVE_PROGS) + PROGS_2 = $(BASE_PROGS) $(NONDECLDEBUG_PROGS) DEBUG_INP = inp2 DECLDEBUG_INP = inp2 else ifneq "$(findstring .decldebug,$(GRADE))" "" - PROGS_2 = $(DECLARATIVE_PROGS) $(DECLDEBUG_DECLARATIVE_PROGS) + PROGS_2 = $(BASE_PROGS) $(DECLDEBUG_PROGS) DEBUG_INP = inp2 DECLDEBUG_INP = inp3 else ifneq "$(findstring mm,$(GRADE))" "" - PROGS_2 = $(DECLARATIVE_PROGS) $(NONDECLDEBUG_DECLARATIVE_PROGS) - DEBUG_INP = inp - DECLDEBUG_INP = inp + PROGS_2 = $(BASE_PROGS) $(NONDECLDEBUG_PROGS) else - PROGS_2 = $(DECLARATIVE_PROGS) $(NONDEBUG_DECLARATIVE_PROGS) \ - $(NONDECLDEBUG_DECLARATIVE_PROGS) - DEBUG_INP = inp - DECLDEBUG_INP = inp + PROGS_2 = $(BASE_PROGS) $(NONDECLDEBUG_PROGS) $(NONDEBUG_PROGS) endif + DEBUG_INP = inp + DECLDEBUG_INP = inp endif endif # Debugging does not work in MLDS (hl*, csharp*, java*) grades, # parallel grades, or deep profiling (profdeep) grades. -# Base grades `jump' and `fast' cannot be used with -# stack layouts (which are required for tracing). -# Also, declarative debugging only works in `.gc' grades. +# +# Declarative debugging only works in `.gc' grades. +# +# Base grades `jump' and `fast' cannot be used with stack layouts +# (which are required for execution tracing). ifeq "$(filter hl% csharp% java%,$(GRADE))$(findstring par,$(GRADE))$(findstring profdeep,$(GRADE))" "" ifneq "$(findstring .gc,$(GRADE))" "" @@ -177,8 +172,8 @@ include ../Mmake.common MCFLAGS += --trace decl MLFLAGS += --trace -# Module-specific options should go in Mercury.options so they -# can be found by `mmc --make'. +# Module-specific options should go in Mercury.options +# to allow them to be found by `mmc --make'. include Mercury.options %.runtest: %.res ; @@ -194,6 +189,8 @@ include Mercury.options # the file name before each line.) # +# Please keep these entries in alphabetical order. + aadebug.out: aadebug aadebug.inp $(MDB_STD) ./aadebug < aadebug.inp > aadebug.out 2>&1 \ || { grep . $@ /dev/null; exit 1; } @@ -251,6 +248,11 @@ catch_retry.out: catch_retry catch_retry.inp > catch_retry.out 2>&1 \ || { grep . $@ /dev/null; exit 1; } +change_search.out: change_search change_search.inp + $(MDB_STD) ./change_search < change_search.inp \ + > change_search.out 2>&1 \ + || { grep . $@ /dev/null; exit 1; } + closure_dependency.out: closure_dependency closure_dependency.$(DEBUG_INP) $(MDB_STD) ./closure_dependency < closure_dependency.$(DEBUG_INP) \ > closure_dependency.out 2>&1 \ @@ -280,11 +282,6 @@ confirm_abort.out: confirm_abort confirm_abort.inp $(MDB) ./confirm_abort < confirm_abort.inp > confirm_abort.out 2>&1 \ || { grep . $@ /dev/null; exit 1; } -change_search.out: change_search change_search.inp - $(MDB_STD) ./change_search < change_search.inp \ - > change_search.out 2>&1 \ - || { grep . $@ /dev/null; exit 1; } - dd_params.out: dd_params dd_params.inp $(MDB) ./dd_params < dd_params.inp > dd_params.out 2>&1 \ || { grep . $@ /dev/null; exit 1; } @@ -333,14 +330,14 @@ explicit_subtree.out: explicit_subtree explicit_subtree.$(DEBUG_INP) > explicit_subtree.out 2>&1 \ || { grep . $@ /dev/null; exit 1; } -family.out: family family.inp - $(MDB) ./family < family.inp > family.out 2>&1 \ - || { grep . $@ /dev/null; exit 1; } - failed_cond.out: failed_cond failed_cond.inp $(MDB_STD) ./failed_cond < failed_cond.inp > failed_cond.out 2>&1 \ || { grep . $@ /dev/null; exit 1; } +family.out: family family.inp + $(MDB) ./family < family.inp > family.out 2>&1 \ + || { grep . $@ /dev/null; exit 1; } + filter.out: filter filter.inp $(MDB_STD) ./filter < filter.inp > filter.out 2>&1 \ || { grep . $@ /dev/null; exit 1; } @@ -440,15 +437,6 @@ mismatch_on_call.out: mismatch_on_call mismatch_on_call.$(DEBUG_INP) > mismatch_on_call.out 2>&1 \ || { grep . $@ /dev/null; exit 1; } -neg_conj.out: neg_conj neg_conj.inp - $(MDB) ./neg_conj < neg_conj.inp > neg_conj.out 2>&1 \ - || { grep . $@ /dev/null; exit 1; } - -nodescend_tracking.out: nodescend_tracking nodescend_tracking.inp - $(MDB_STD) ./nodescend_tracking < nodescend_tracking.inp \ - > nodescend_tracking.out 2>&1 \ - || { grep . $@ /dev/null; exit 1; } - named_fields.out: named_fields named_fields.inp $(MDB_STD) ./named_fields < named_fields.inp \ > named_fields.out 2>&1 \ @@ -458,13 +446,22 @@ negation.out: negation negation.inp $(MDB) ./negation < negation.inp > negation.out 2>&1 \ || { grep . $@ /dev/null; exit 1; } -oracle_db.out: oracle_db oracle_db.inp - $(MDB) ./oracle_db < oracle_db.inp > oracle_db.out 2>&1 \ +neg_conj.out: neg_conj neg_conj.inp + $(MDB) ./neg_conj < neg_conj.inp > neg_conj.out 2>&1 \ + || { grep . $@ /dev/null; exit 1; } + +nodescend_tracking.out: nodescend_tracking nodescend_tracking.inp + $(MDB_STD) ./nodescend_tracking < nodescend_tracking.inp \ + > nodescend_tracking.out 2>&1 \ || { grep . $@ /dev/null; exit 1; } output_term_dep.out: output_term_dep output_term_dep.inp $(MDB_STD) ./output_term_dep < output_term_dep.inp \ - > output_term_dep.out 2>&1 \ + > output_term_dep.out 2>&1 \ + || { grep . $@ /dev/null; exit 1; } + +oracle_db.out: oracle_db oracle_db.inp + $(MDB) ./oracle_db < oracle_db.inp > oracle_db.out 2>&1 \ || { grep . $@ /dev/null; exit 1; } partial.out: partial partial.inp @@ -480,20 +477,6 @@ priv_builtin_bug.out: priv_builtin_bug priv_builtin_bug.inp priv_builtin_bug.out 2>&1 \ || { grep . $@ /dev/null; exit 1; } -# We need to pipe the output through sed to avoid hard-coding dependencies on -# particular line numbers in the standard library source code. -track_through_catch.out: track_through_catch track_through_catch.inp - $(MDB_STD) ./track_through_catch < track_through_catch.inp 2>&1 | \ - sed -e 's/exception.m:[0-9]*/exception.m:NNNN/g' \ - > track_through_catch.out 2>&1 \ - || { grep . $@ /dev/null; exit 1; } - -typed_unify.out: typed_unify typed_unify.inp - $(MDB_STD) ./typed_unify < typed_unify.inp 2>&1 | \ - sed -e 's/univ.m:[0-9]*/univ.m:NNNN/g' \ - > typed_unify.out 2>&1 \ - || { grep . $@ /dev/null; exit 1; } - propositional.out: propositional propositional.inp $(MDB_STD) ./propositional < propositional.inp > \ propositional.out 2>&1 \ @@ -505,7 +488,7 @@ queens.out: queens queens.inp remember_modes.out: remember_modes remember_modes.inp $(MDB_STD) ./remember_modes < remember_modes.inp \ - > remember_modes.out 2>&1 \ + > remember_modes.out 2>&1 \ || { grep . $@ /dev/null; exit 1; } resume.out: resume resume.inp @@ -524,6 +507,10 @@ shallow.out: shallow shallow.inp $(MDB) ./shallow < shallow.inp > shallow.out 2>&1 \ || { grep . $@ /dev/null; exit 1; } +skip.out: skip skip.inp + $(MDB_STD) ./skip < skip.inp > skip.out 2>&1 \ + || { grep . $@ /dev/null; exit 1; } + small.out: small small.inp $(MDB) ./small < small.inp > small.out 2>&1 \ || { grep . $@ /dev/null; exit 1; } @@ -550,10 +537,6 @@ special_term_dep.out: special_term_dep special_term_dep.inp > special_term_dep.out 2>&1 \ || { grep . $@ /dev/null; exit 1; } -skip.out: skip skip.inp - $(MDB_STD) ./skip < skip.inp > skip.out 2>&1 \ - || { grep . $@ /dev/null; exit 1; } - supertree_warning.out: supertree_warning supertree_warning.inp $(MDB_STD) ./supertree_warning < supertree_warning.inp > supertree_warning.out 2>&1 \ || { grep . $@ /dev/null; exit 1; } @@ -578,10 +561,24 @@ throw.out: throw throw.inp > throw.out 2>&1 \ || { grep . $@ /dev/null; exit 1; } +# We need to pipe the output through sed to avoid hard-coding dependencies on +# particular line numbers in the standard library source code. +track_through_catch.out: track_through_catch track_through_catch.inp + $(MDB_STD) ./track_through_catch < track_through_catch.inp 2>&1 | \ + sed -e 's/exception.m:[0-9]*/exception.m:NNNN/g' \ + > track_through_catch.out 2>&1 \ + || { grep . $@ /dev/null; exit 1; } + trust.out: trust trust.inp $(MDB_STD) ./trust < trust.inp > trust.out 2>&1 \ || { grep . $@ /dev/null; exit 1; } +typed_unify.out: typed_unify typed_unify.inp + $(MDB_STD) ./typed_unify < typed_unify.inp 2>&1 | \ + sed -e 's/univ.m:[0-9]*/univ.m:NNNN/g' \ + > typed_unify.out 2>&1 \ + || { grep . $@ /dev/null; exit 1; } + undo.out: undo undo.inp $(MDB_STD) ./undo < undo.inp > undo.out 2>&1 \ || { grep . $@ /dev/null; exit 1; } @@ -592,7 +589,7 @@ unsafe_cast.out: unsafe_cast unsafe_cast.inp untraced_subgoal.out: untraced_subgoal untraced_subgoal.inp $(MDB) ./untraced_subgoal < untraced_subgoal.inp \ - > untraced_subgoal.out 2>&1 \ + > untraced_subgoal.out 2>&1 \ || { grep . $@ /dev/null; exit 1; } #-----------------------------------------------------------------------------#