mercurylang/mercury
1
0
Fork 0
mirror of https://github.com/Mercury-Language/mercury.git synced 2026-04-15 17:33:38 +00:00
Code Issues Projects Releases Wiki Activity

Remove stale references to test subdirs.

Browse Source 
A long time ago, test directories such as hard_coded had subdirectories
such as hard_coded/typeclasses. These have since been flattened out
(e.g. hard_coded/typeclasses is now just typeclasses), but there were
still remnants of the old approach. This diff deletes those remnants.

tests/*/Mmakefile:
    Delete the TESTS_DIR and the SUBDIRS mmake variables; TESTS_DIR
    was always set to "..", and SUBDIRS to the empty string.

    Delete any references to the make variable NOT_WORKING, since
    it is never used.

tests/Mmake.common:
    Document that Mmakefiles in test directories don't have to set
    TESTS_DIR and SUBDIRS anymore. Fix the formatting of the documentation
    of the make variables they do still have to set.

    Delete the targets and actions for handling subdirectories of
    test directories, since there aren't any.

tests/Mmakefile:
    Simplify some code.
This commit is contained in:
Zoltan Somogyi
2020-04-14 11:23:12 +10:00
parent b79cdbe0e6
commit afe2887882
41 changed files with 70 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
tests/Mmake.common
View File

@@ -4,15 +4,15 @@
# Mmake.common - shared Mmake variables and rules for the test directories.
#
# The including Mmakefile must set the following variables:
# THIS_DIR - the name of the directory containing tests
# (e.g. benchmarks, hard_coded/typeclasses)
# TESTS_DIR - the directory containing this file.
# SUBDIRS - the names of any subdirectories containing tests.
# PROGS - the names of the main modules of the test programs.
# TESTS- the names of the tests. For each test there must be targets
# test.depend, test.runtest and test.realclean, unless the test ends
# in `-nodepend', in which case the `-nodepend' suffix will be stripped
# off and the test.depend target is not required.
#
# - THIS_DIR: the name of the directory (e.g. benchmarks, hard_coded, etc).
#
# - PROGS: The names of the main modules of the test programs.
#
# - TESTS: The names of the tests. For each test there must be targets
# test.depend, test.runtest and test.realclean, unless the test ends
# in `-nodepend', in which case the `-nodepend' suffix will be stripped
# off and the test.depend target is not required.
#
# If the variable ERROR_FILE is set, only the tests which failed in
# the test run which produced the specified error log file will be run.
@@ -40,9 +40,13 @@ endif
# file by setting both GRADEFLAGS-foo.
ifndef DIFF_OPTS
DIFF_OPTS=-u
DIFF_OPTS = -u
endif
# From the perspective of each test subdirectory, this directory,
# their parent directory, is the top level test directory.
TESTS_DIR = ..
# Override this with `RUN_RECOMPILATION_TESTS=no' if your compiler
# cannot run smart recompilation. This is only necessary for compilers
# built in deep profiling grades, because smart recompilation uses
@@ -246,35 +250,21 @@ clean_trace_counts:
# The `foo' targets make recursively make `foo' in all subdirectories.
# before making `foo_local' in the current directory.
.PHONY: runtests runtests_local runtests_subdirs
.PHONY: check check_local check_subdirs
.PHONY: realclean_subdirs clean_subdirs
.PHONY: runtests runtests_local check check_local
realclean: realclean_subdirs
clean: clean_subdirs
all: runtests
check: runtests
check_local: runtests_local
check_subdirs: runtests_subdirs
# We want to run all the tests, even if some fail, so run the tests
# using `mmake -k'.
runtests:
+@if mmake -k runtests_local runtests_subdirs; then \
+@if mmake -k runtests_local; then \
rm -f $(ERROR_OUTPUT_FILE); \
else \
for subdir in $(SUBDIRS) x; do \
if [ -f $$subdir/$(ERROR_OUTPUT_FILE) ]; then \
cat $$subdir/$(ERROR_OUTPUT_FILE) \
>> $(ERROR_OUTPUT_FILE); \
fi; \
if [ -f $$subdir/FAILED_TESTS ]; then \
sed "s@^@$$subdir/@" $$subdir/FAILED_TESTS \
>> FAILED_TESTS; \
fi; \
done; \
echo SOME TESTS FAILED: see FAILED_TESTS and $(ERROR_OUTPUT_FILE); \
exit 1; \
fi
@@ -387,38 +377,4 @@ runtests_local:
endif # THIS_DIR_TESTS_TO_RUN != ""
ifeq ($(SUBDIRS),)
runtests_subdirs realclean_subdirs clean_subdirs : ;
else
RUNTESTS_IN_SUBDIRS=$(SUBDIRS:%=runtests_in_%)
runtests_subdirs: $(RUNTESTS_IN_SUBDIRS)
.PHONY: $(RUNTESTS_IN_SUBDIRS)
$(RUNTESTS_IN_SUBDIRS): runtests_in_%:
+if test -d $* ; then \
cd $* && mmake runtests ; \
else \
echo Could not run tests in directory $* ; \
echo Could not run tests in directory $* >> NOMAKE_DIRS ; \
fi
realclean_subdirs:
+succeeded=true; \
for dir in $(SUBDIRS); do \
(cd $$dir && mmake realclean) || succeeded=false; \
done
case $$succeeded in false) exit 1 ;; esac
clean_subdirs:
+succeeded=true; \
for dir in $(SUBDIRS); do \
(cd $$dir && mmake clean) || succeeded=false; \
done; \
case $$succeeded in false) exit 1 ;; esac
endif # SUBDIRS != ""
#-----------------------------------------------------------------------------#

3
tests/Mmakefile
View File

@@ -50,5 +50,4 @@ SUBDIRS = \
NOT_YET_READY_SUBDIRS = \
stm
TESTS_DIR=.
include $(TESTS_DIR)/Mmake.common
include Mmake.common

7
tests/accumulator/Mmakefile
View File

@@ -3,8 +3,6 @@
#-----------------------------------------------------------------------------#
THIS_DIR = accumulator
SUBDIRS =
TESTS_DIR = ..
MAYBE_J1 =
#-----------------------------------------------------------------------------#
@@ -36,7 +34,7 @@ ACCUMULATOR_PROGS = \
PROGS = $(ACCUMULATOR_PROGS)
TESTS = $(PROGS)
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
# Module-specific options should go in Mercury.options so they
# can be found by `mmc --make'.
@@ -62,9 +60,6 @@ OPT_FLAGS = \
# after EXTRA_MCFLAGS, so that we can override things set in EXTRA_MCFLAGS.
ALL_MCFLAGS += $(OPT_FLAGS) $(ACC_FLAGS)
# programs which aren't working.
NOT_WORKING =
EXPS = $(PROGS:%=%.exp)
exp: $(EXPS)

4
tests/analysis/Mmakefile
View File

@@ -3,8 +3,6 @@
#-----------------------------------------------------------------------------#
THIS_DIR = analysis
SUBDIRS =
TESTS_DIR = ..
MAYBE_J1 =
# Delete options which are incompatible with --intermodule-analysis.
@@ -15,6 +13,6 @@ override EXTRA_MCFLAGS := $(patsubst --transitive-%,,$(EXTRA_MCFLAGS))
#-----------------------------------------------------------------------------#
TESTS =
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
#-----------------------------------------------------------------------------#

4
tests/analysis_ctgc/Mmakefile
View File

@@ -3,8 +3,6 @@
#-----------------------------------------------------------------------------#
THIS_DIR = analysis_ctgc
SUBDIRS =
TESTS_DIR = ..
MAYBE_J1 = -j1
# Delete options which are incompatible with --intermodule-analysis.
@@ -20,7 +18,7 @@ else
TESTS =
endif
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
reuse_m1.runtest:
MC=$(MC) ./reuse_runtest.sh

4
tests/analysis_excp/Mmakefile
View File

@@ -3,8 +3,6 @@
#-----------------------------------------------------------------------------#
THIS_DIR = analysis_excp
SUBDIRS =
TESTS_DIR = ..
MAYBE_J1 = -j1
# Delete options which are incompatible with --intermodule-analysis.
@@ -20,7 +18,7 @@ else
TESTS =
endif
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
excp_m1.runtest:
MC=$(MC) ./excp_runtest.sh

4
tests/analysis_external/Mmakefile
View File

@@ -3,8 +3,6 @@
#-----------------------------------------------------------------------------#
THIS_DIR = analysis_external
SUBDIRS =
TESTS_DIR = ..
MAYBE_J1 = -j1
# Delete options which are incompatible with --intermodule-analysis.
@@ -22,7 +20,7 @@ else
TESTS =
endif
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
ext.runtest:
MC=$(MC) ./ext_runtest.sh

4
tests/analysis_sharing/Mmakefile
View File

@@ -3,8 +3,6 @@
#-----------------------------------------------------------------------------#
THIS_DIR = analysis_sharing
SUBDIRS =
TESTS_DIR = ..
MAYBE_J1 =
# Delete options which are incompatible with --intermodule-analysis.
@@ -20,7 +18,7 @@ else
TESTS =
endif
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
sharing_m1.runtest:
MC=$(MC) ./sharing_runtest.sh

4
tests/analysis_table/Mmakefile
View File

@@ -3,8 +3,6 @@
#-----------------------------------------------------------------------------#
THIS_DIR = analysis_table
SUBDIRS =
TESTS_DIR = ..
MAYBE_J1 =
# Delete options which are incompatible with --intermodule-analysis.
@@ -20,7 +18,7 @@ else
TESTS =
endif
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
table_m1.runtest:
MC=$(MC) ./table_runtest.sh

4
tests/analysis_trail/Mmakefile
View File

@@ -3,8 +3,6 @@
#-----------------------------------------------------------------------------#
THIS_DIR = analysis_trail
SUBDIRS =
TESTS_DIR = ..
MAYBE_J1 = -j1
# Delete options which are incompatible with --intermodule-analysis.
@@ -20,7 +18,7 @@ else
TESTS =
endif
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
trail_m1.runtest:
MC=$(MC) ./trail_runtest.sh

4
tests/analysis_unused_args/Mmakefile
View File

@@ -3,8 +3,6 @@
#-----------------------------------------------------------------------------#
THIS_DIR = analysis_unused_args
SUBDIRS =
TESTS_DIR = ..
MAYBE_J1 = -j1
# Delete options which are incompatible with --intermodule-analysis.
@@ -20,7 +18,7 @@ else
TESTS =
endif
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
ua_m1.runtest:
MC=$(MC) ./unused_args_runtest.sh

4
tests/benchmarks/Mmakefile
View File

@@ -3,8 +3,6 @@
#-----------------------------------------------------------------------------#
THIS_DIR = benchmarks
SUBDIRS =
TESTS_DIR = ..
MAYBE_J1 =
# To test the performance of the benchmarks (with I/O suppressed),
@@ -30,7 +28,7 @@ PROGS = \
tak
TESTS = $(PROGS)
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
# Module-specific options should go in Mercury.options so they can be found
# by `mmc --make'.

4
tests/debugger/Mmakefile
View File

@@ -3,8 +3,6 @@
#-----------------------------------------------------------------------------#
THIS_DIR = debugger
SUBDIRS =
TESTS_DIR = ..
MAYBE_J1 =
#-----------------------------------------------------------------------------#
@@ -237,7 +235,7 @@ else
endif
TESTS = $(sort $(PROGS))
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
# The minimum trace level in .decldebug grades is --trace decl.
ifneq "$(findstring decldebug,$(GRADE))" ""

4
tests/declarative_debugger/Mmakefile
View File

@@ -3,8 +3,6 @@
#-----------------------------------------------------------------------------#
THIS_DIR = declarative_debugger
SUBDIRS=
TESTS_DIR=..
MAYBE_J1 = -j1
# Most test cases share library_forwarding.m. We could allow the tests
# to be done in parallel if we made a separate copy of that module
@@ -173,7 +171,7 @@ else
endif
TESTS = $(sort $(PROGS))
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
MCFLAGS += --trace decl
MLFLAGS += --trace

4
tests/dppd/Mmakefile
View File

@@ -3,8 +3,6 @@
#-----------------------------------------------------------------------------#
THIS_DIR = dppd
SUBDIRS =
TESTS_DIR = ..
MAYBE_J1 = -j1
# For this directory, rather than having a separate main for each test,
@@ -13,7 +11,7 @@ MAYBE_J1 = -j1
PROGS = run
TESTS = $(sort $(PROGS))
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
# Module-specific options should go in Mercury.options so they can be found
# by `mmc --make'.

4
tests/exceptions/Mmakefile
View File

@@ -10,8 +10,6 @@
#
THIS_DIR = exceptions
SUBDIRS =
TESTS_DIR = ..
MAYBE_J1 =
#-----------------------------------------------------------------------------#
@@ -46,7 +44,7 @@ else
endif
TESTS = $(PROGS)
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
# Module-specific options should go in Mercury.options so they
# can be found by `mmc --make'.

4
tests/feedback/Mmakefile
View File

@@ -3,8 +3,6 @@
#-----------------------------------------------------------------------------#
THIS_DIR = feedback
TESTS_DIR = ..
SUBDIRS =
MAYBE_J1 =
#-----------------------------------------------------------------------------#
@@ -16,7 +14,7 @@ AUTOPAR_REPORTS = \
REPORTS = $(patsubst %,autopar_%,$(AUTOPAR_REPORTS))
TESTS = $(patsubst %,%-nodepend,$(sort $(REPORTS)))
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
# Try to use the feedback tools in this workspace if available;
# otherwise, use the tools in $PATH.

16
tests/general/Mmakefile
View File

@@ -3,8 +3,6 @@
#-----------------------------------------------------------------------------#
THIS_DIR = general
SUBDIRS =
TESTS_DIR = ..
MAYBE_J1 =
#-----------------------------------------------------------------------------#
@@ -86,20 +84,20 @@ EXCEPTION_PROGS = \
map_corresponding \
unused_arg_determinism
# dnf.m does not work in non-gc grades, because it uses `pragma memo'
# (i.e. tabling) and tabling is not yet implemented for non-gc grades.
#
# The problem for state_var_trace is lack of needed reordering by the
# unique mode system.
ifneq "$(findstring profdeep,$(GRADE))" ""
PROGS = $(ORDINARY_PROGS)
else
PROGS = $(ORDINARY_PROGS) $(EXCEPTION_PROGS)
endif
# dnf.m does not work in non-gc grades, because it uses `pragma memo'
# (i.e. tabling) and tabling is not yet implemented for non-gc grades.
# The problem for state_var_trace is lack of needed reordering by the
# unique mode system.
NOT_WORKING = dnf state_var_trace
TESTS = $(sort $(PROGS))
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
# Module-specific options should go in Mercury.options so they can be found
# by `mmc --make'.

4
tests/grade_subdirs/Mmakefile
View File

@@ -5,8 +5,6 @@
# The tests in this directory are always run with `--use-grade-subdirs'.
THIS_DIR = grade_subdirs
SUBDIRS =
TESTS_DIR = ..
MAYBE_J1 =
ifndef WORKSPACE
@@ -22,7 +20,7 @@ endif
MMAKE_USE_MMC_MAKE=yes
TESTS = $(sort $(PROGS))
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
# Module-specific options should go in Mercury.options so they can be found
# by `mmc --make'.

4
tests/hard_coded/Mmakefile
View File

@@ -3,8 +3,6 @@
#-----------------------------------------------------------------------------#
THIS_DIR = hard_coded
SUBDIRS =
TESTS_DIR = ..
MAYBE_J1 =
#-----------------------------------------------------------------------------#
@@ -905,7 +903,7 @@ PROGS = \
#-----------------------------------------------------------------------------#
TESTS = $(sort $(PROGS))
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
# Module-specific options should go in Mercury.options so they can be found
# by `mmc --make'.

4
tests/invalid/Mmakefile
View File

@@ -3,8 +3,6 @@
#-----------------------------------------------------------------------------#
THIS_DIR = invalid
SUBDIRS =
TESTS_DIR = ..
MAYBE_J1 =
# Note: multi-module tests are listed separately from single-module tests
@@ -441,7 +439,7 @@ SINGLEMODULE_PROGS = $(SINGLEMODULE) \
PROGS = $(SINGLEMODULE_PROGS) $(MULTIMODULE_PROGS)
TESTS = $(sort $(MULTIMODULE_PROGS) $(SINGLEMODULE_PROGS:%=%-nodepend))
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
# Module-specific options should go in Mercury.options so they can be found
# by `mmc --make'.

4
tests/invalid_make_int/Mmakefile
View File

@@ -3,8 +3,6 @@
#-----------------------------------------------------------------------------#
THIS_DIR = invalid_make_int
SUBDIRS =
TESTS_DIR = ..
MAYBE_J1 =
# Note: multi-module tests are listed separately from single-module tests
@@ -22,7 +20,7 @@ MULTI_MODULE_PROGS =
PROGS = $(SINGLE_MODULE_PROGS) $(MULTI_MODULE_PROGS)
TESTS = $(sort $(PROGS:%=%-nodepend))
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
# Module-specific options should go in Mercury.options so they can be found
# by `mmc --make'.

4
tests/invalid_purity/Mmakefile
View File

@@ -3,8 +3,6 @@
#-----------------------------------------------------------------------------#
THIS_DIR = invalid_purity
SUBDIRS =
TESTS_DIR = ..
MAYBE_J1 =
PROGS = \
@@ -25,7 +23,7 @@ PROGS = \
purity_type_error
TESTS = $(PROGS)
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
# These tests all get spurious failures with intermodule optimization,
# because the errors get detected when creating the `.opt' file rather

4
tests/invalid_submodules/Mmakefile
View File

@@ -3,8 +3,6 @@
#-----------------------------------------------------------------------------#
THIS_DIR = invalid_submodule
SUBDIRS =
TESTS_DIR = ..
MAYBE_J1 = -j1
# This directory contains tests for errors in programs in which at least
@@ -37,7 +35,7 @@ DO_NOT_MAKE_DEP_PROGS = \
PROGS = $(MAKE_DEP_PROGS) $(DO_NOT_MAKE_DEP_PROGS)
TESTS = $(sort $(MAKE_DEP_PROGS) $(DO_NOT_MAKE_DEP_PROGS:%=%-nodepend))
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
# Module-specific options should go in Mercury.options so they can be found
# by `mmc --make'.

4
tests/misc_tests/Mmakefile
View File

@@ -3,8 +3,6 @@
#-----------------------------------------------------------------------------#
THIS_DIR = misc_tests
SUBDIRS =
TESTS_DIR = ..
MAYBE_J1 =
PROGS =
@@ -16,7 +14,7 @@ TESTS = \
# (util/mdemangle.c doesn't correctly demangle internal labels)
# TESTS += mdemangle_test_hl-nodepend
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
# Module-specific options should go in Mercury.options so they
# can be found by `mmc --make'.

4
tests/mmc_make/Mmakefile
View File

@@ -3,8 +3,6 @@
#-----------------------------------------------------------------------------#
THIS_DIR = mmc_make
SUBDIRS =
TESTS_DIR = ..
MAYBE_J1 =
#-----------------------------------------------------------------------------#
@@ -28,7 +26,7 @@ ifneq ($(origin WORKSPACE),undefined)
endif
TESTS = $(sort $(PROGS))
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
%.runtest: %.res ;

4
tests/par_conj/Mmakefile
View File

@@ -3,8 +3,6 @@
#-----------------------------------------------------------------------------#
THIS_DIR = par_conj
SUBDIRS =
TESTS_DIR = ..
MAYBE_J1 =
#-----------------------------------------------------------------------------#
@@ -115,7 +113,7 @@ OBJS = $(OBJ_PROGS:%=$(TARGET_OBJ_SUBDIR)%.$(TARGET_OBJ_EXT))
#-----------------------------------------------------------------------------#
TESTS = $(sort $(PROGS))
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
# Module-specific options should go in Mercury.options so they
# can be found by `mmc --make'.

4
tests/purity/Mmakefile
View File

@@ -3,8 +3,6 @@
#-----------------------------------------------------------------------------#
THIS_DIR = purity
SUBDIRS =
TESTS_DIR = ..
MAYBE_J1 =
#-----------------------------------------------------------------------------#
@@ -21,7 +19,7 @@ PURITY_PROGS = \
PROGS = $(PURITY_PROGS)
TESTS = $(sort $(PROGS))
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
# Module-specific options should go in Mercury.options so they can be found
# by `mmc --make'.

4
tests/recompilation/Mmakefile
View File

@@ -3,8 +3,6 @@
#-----------------------------------------------------------------------------#
THIS_DIR = recompilation
SUBDIRS =
TESTS_DIR = ..
MAYBE_J1 = -j1
TESTS_SHOULD_SUCCEED = \
@@ -51,7 +49,7 @@ PROGS = $(TESTS_SHOULD_SUCCEED) $(NO_PARALLEL_MAKE_TESTS) \
$(TESTS_SHOULD_FAIL)
TESTS = $(sort $(PROGS:%=%-nodepend))
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
# Module-specific options should go in Mercury.options so they
# can be found by `mmc --make'.

4
tests/stm/Mmakefile
View File

@@ -3,8 +3,6 @@
#-----------------------------------------------------------------------------#
THIS_DIR = stm
SUBDIRS =
TESTS_DIR = ..
MAYBE_J1 = -j1
#-----------------------------------------------------------------------------#
@@ -73,7 +71,7 @@ OBJS = $(OBJ_PROGS:%=$(TARGET_OBJ_SUBDIR)%.$(TARGET_OBJ_EXT))
#-----------------------------------------------------------------------------#
TESTS = $(sort $(PROGS))
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
# Module-specific options should go in Mercury.options so they
# can be found by `mmc --make'.

4
tests/string_format/Mmakefile
View File

@@ -3,8 +3,6 @@
#-----------------------------------------------------------------------------#
THIS_DIR = string_format
SUBDIRS =
TESTS_DIR = ..
MAYBE_J1 = -j1
#-----------------------------------------------------------------------------#
@@ -50,7 +48,7 @@ else
endif
TESTS = $(sort $(PROGS))
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
# Module-specific options should go in Mercury.options so they can be found
# by `mmc --make'.

19
tests/structure_reuse/Mmakefile
View File

@@ -3,12 +3,8 @@
#-----------------------------------------------------------------------------#
THIS_DIR = structure_reuse
SUBDIRS =
TESTS_DIR = ..
MAYBE_J1 =
# Any program added here should also be added to the `.cvsignore' file.
STRUCTURE_REUSE_PROGS = \
if_then_else \
internal_alias \
@@ -22,7 +18,8 @@ else
endif
TESTS = $(PROGS)
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
# Module-specific options should go in Mercury.options so they
# can be found by `mmc --make'.
@@ -38,14 +35,10 @@ ACC_FLAGS = --structure-reuse -d structure_reuse --dump-hlds-options sr
OPT_FLAGS = --no-static-ground-terms
# Ensure that the accumulator introduction flags are passed
# after EXTRA_MCFLAGS, so that we can override things set in
# EXTRA_MCFLAGS.
#ALL_MCDFLAGS+= $(ACC_FLAGS)
#ALL_MCGFLAGS+= $(OPT_FLAGS) $(ACC_FLAGS)
EXTRA_MCFLAGS+= $(OPT_FLAGS) $(ACC_FLAGS)
# programs which aren't working.
NOT_WORKING =
# after EXTRA_MCFLAGS, so that we can override things set in EXTRA_MCFLAGS.
# ALL_MCDFLAGS += $(ACC_FLAGS)
# ALL_MCGFLAGS += $(OPT_FLAGS) $(ACC_FLAGS)
EXTRA_MCFLAGS += $(OPT_FLAGS) $(ACC_FLAGS)
realclean_local: clean_hlds_dump

4
tests/submodules/Mmakefile
View File

@@ -8,8 +8,6 @@
#-----------------------------------------------------------------------------#
THIS_DIR = submodules
TESTS_DIR = ..
SUBDIRS =
MAYBE_J1 = -j1
# Currently these test cases do not reliably pass if you use parallel make.
@@ -52,7 +50,7 @@ endif
PROGS = $(SUB_MODULE_PROGS) $(SOLVER_PROGS)
TESTS = $(sort $(PROGS))
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
# Module-specific options should go in Mercury.options so they can be found
# by `mmc --make'.

4
tests/tabling/Mmakefile
View File

@@ -3,8 +3,6 @@
#-----------------------------------------------------------------------------#
THIS_DIR = tabling
SUBDIRS =
TESTS_DIR = ..
MAYBE_J1 =
#-----------------------------------------------------------------------------#
@@ -198,7 +196,7 @@ else
endif
TESTS = $(sort $(PROGS))
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
# Module-specific options should go in Mercury.options so they
# can be found by `mmc --make'.

4
tests/term/Mmakefile
View File

@@ -3,8 +3,6 @@
#-----------------------------------------------------------------------------#
THIS_DIR = term
SUBDIRS =
TESTS_DIR = ..
MAYBE_J1 =
#-----------------------------------------------------------------------------#
@@ -90,7 +88,7 @@ PROGS = $(TERM_PROGS)
#-----------------------------------------------------------------------------#
TESTS = $(sort $(PROGS))
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
%.runtest: %.trans_opt_res ;

4
tests/trailing/Mmakefile
View File

@@ -3,8 +3,6 @@
#-----------------------------------------------------------------------------#
THIS_DIR = trailing
SUBDIRS =
TESTS_DIR = ..
MAYBE_J1 =
#-----------------------------------------------------------------------------#
@@ -26,7 +24,7 @@ endif
#-----------------------------------------------------------------------------#
TESTS = $(sort $(PROGS))
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
# Module-specific options should go in Mercury.options so they can be found
# by `mmc --make'.

4
tests/typeclasses/Mmakefile
View File

@@ -3,8 +3,6 @@
#-----------------------------------------------------------------------------#
THIS_DIR = typeclasses
SUBDIRS =
TESTS_DIR = ..
MAYBE_J1 =
#-----------------------------------------------------------------------------#
@@ -96,7 +94,7 @@ PROGS = \
TESTS = $(PROGS)
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
# Module-specific options should go in Mercury.options so they
# can be found by `mmc --make'.

6
tests/valid/Mmakefile
View File

@@ -3,15 +3,13 @@
#-----------------------------------------------------------------------------#
THIS_DIR = valid
SUBDIRS =
TESTS_DIR = ..
MAYBE_J1 =
#-----------------------------------------------------------------------------#
# Please keep these lists sorted.
# The documentation of what tests each list should contain (what little
# there is of it) is in $(TESTS_DIR)/valid/Mmake.valid.common.
# there is of it) is in ../valid/Mmake.valid.common.
AGC_PROGS = \
agc_graph \
@@ -350,4 +348,4 @@ NON_DECLDEBUG_PROGS = \
#
# solver_type_mutable_bug
include $(TESTS_DIR)/valid/Mmake.valid.common
include ../valid/Mmake.valid.common

4
tests/valid_make_int/Mmakefile
View File

@@ -3,8 +3,6 @@
#-----------------------------------------------------------------------------#
THIS_DIR = valid_make_int
SUBDIRS =
TESTS_DIR = ..
MAYBE_J1 =
#-----------------------------------------------------------------------------#
@@ -17,7 +15,7 @@ SINGLE_MODULE_PROGS = \
PROGS = $(SINGLE_MODULE_PROGS)
TESTS = $(sort $(SINGLE_MODULE_PROGS:%=%-nodepend))
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
# Module-specific options should go in Mercury.options so they can be found
# by `mmc --make'.

6
tests/valid_seq/Mmakefile
View File

@@ -3,15 +3,13 @@
#-----------------------------------------------------------------------------#
THIS_DIR = valid_seq
SUBDIRS =
TESTS_DIR = ..
MAYBE_J1 = -j1
#-----------------------------------------------------------------------------#
# Please keep these lists sorted.
# The documentation of what tests each list should contain (what little
# there is of it) is in $(TESTS_DIR)/valid/Mmake.valid.common.
# there is of it) is in ../valid/Mmake.valid.common.
AGC_PROGS =
@@ -96,6 +94,6 @@ $(dates_subdir)intermod_nested_module2.date: \
$(dates_subdir)intermod_user_equality_nested2.date: \
$(date0s_subdir)intermod_user_equality_nested2.date0
include $(TESTS_DIR)/valid/Mmake.valid.common
include ../valid/Mmake.valid.common
clean_local:

4
tests/warnings/Mmakefile
View File

@@ -3,8 +3,6 @@
#-----------------------------------------------------------------------------#
THIS_DIR = warnings
SUBDIRS =
TESTS_DIR = ..
MAYBE_J1 =
#-----------------------------------------------------------------------------#
@@ -82,7 +80,7 @@ endif
PROGS = $(COMPILE_PROGS) $(ERRORCHECK_PROGS) up_to_date
TESTS = $(sort $(PROGS))
include $(TESTS_DIR)/Mmake.common
include ../Mmake.common
# Module-specific options should go in Mercury.options so they
# can be found by `mmc --make'.