mirror of
https://github.com/Mercury-Language/mercury.git
synced 2026-04-15 01:13:30 +00:00
Avoid warnings from make.
tests/analysis/Mmakefile:
tests/analysis_ctgc/Mmakefile:
tests/analysis_excp/Mmakefile:
tests/analysis_external/Mmakefile:
tests/analysis_sharing/Mmakefile:
tests/analysis_table/Mmakefile:
tests/analysis_trail/Mmakefile:
tests/analysis_unused_args/Mmakefile:
tests/feedback/Mmakefile:
All these files include tests/Mmake.common, whose documentation says
that all Mmakefiles including it should define the PROGS make variable.
These files did not, which led to annoying diagnostics from make.
This diff adds the missing definitions.
tests/invalid/Mmakefile:
Delete a reference to a variable whose definition was deleted in June.
(The one test whose name its value contained was moved into
the value of another, similar variable.)
tests/Mmake.common:
Stop defining RUN_RECOMPILATION_TESTS, because it has not been used
since 2021.
Fix two typos.
tests/recompilation/Mmakefile:
Delete the only remaining mention of RUN_RECOMPILATION_TESTS,
which is in an unused target.
This commit is contained in:
Zoltan Somogyi
@@ -64,12 +64,6 @@ ifndef DIFF_OPTS
|
||||
DIFF_OPTS = -u
|
||||
endif
|
||||
|
||||
# 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
|
||||
# exception handling, which does not yet work with deep profiling.
|
||||
RUN_RECOMPILATION_TESTS=yes
|
||||
|
||||
# The Java interpreter.
|
||||
JAVA=java
|
||||
|
||||
@@ -122,7 +116,7 @@ $(TESTS_DIR)/Mmake.params: ;
|
||||
{ grep . $@ /dev/null; exit 1; }
|
||||
|
||||
# DIFF_WO stands for "diff with opts". We define it to allow the actions
|
||||
# for %.int_exp_res to fit onto one line.
|
||||
# for e.g. %.opfile_res to fit onto one line.
|
||||
DIFF_WO = diff $(DIFF_OPTS)
|
||||
|
||||
# For some test cases, there is more than one valid output.
|
||||
@@ -241,7 +235,7 @@ DIFF_WO = diff $(DIFF_OPTS)
|
||||
echo "Matched $*.optfile_exp" && \
|
||||
cp $*.optfile_res1 $@; } || \
|
||||
{ test -f $*.optfile_exp2 && \
|
||||
$(DIFF_WO) $*.optfile_exp2 $*.out > $*.optfile_res2 && \
|
||||
$(DIFF_WO) $*.optfile_exp2 $*.optfile_out > $*.optfile_res2 && \
|
||||
echo "Matched $*.optfile_exp2" && \
|
||||
cp $*.optfile_res2 $@; } || \
|
||||
{ test -f $*.optfile_exp3 && \
|
||||
|
||||
@@ -13,6 +13,7 @@ override EXTRA_MCFLAGS := $(patsubst --transitive-%,,$(EXTRA_MCFLAGS))
|
||||
|
||||
#-----------------------------------------------------------------------------#
|
||||
|
||||
PROGS =
|
||||
TESTS =
|
||||
include ../Mmake.common
|
||||
|
||||
|
||||
@@ -14,11 +14,13 @@ override EXTRA_MCFLAGS := $(patsubst --transitive-%,,$(EXTRA_MCFLAGS))
|
||||
#-----------------------------------------------------------------------------#
|
||||
|
||||
ifdef WORKSPACE_HAS_SUBDIRS
|
||||
TESTS = reuse_m1-nodepend
|
||||
PROGS = reuse_m1
|
||||
else
|
||||
TESTS =
|
||||
PROGS =
|
||||
endif
|
||||
|
||||
TESTS = $(sort $(PROGS:%=%.nodepend))
|
||||
|
||||
include ../Mmake.common
|
||||
|
||||
reuse_m1.runtest:
|
||||
|
||||
@@ -14,11 +14,13 @@ override EXTRA_MCFLAGS := $(patsubst --transitive-%,,$(EXTRA_MCFLAGS))
|
||||
#-----------------------------------------------------------------------------#
|
||||
|
||||
ifdef WORKSPACE_HAS_SUBDIRS
|
||||
TESTS = excp_m1-nodepend
|
||||
PROGS = excp_m1
|
||||
else
|
||||
TESTS =
|
||||
PROGS =
|
||||
endif
|
||||
|
||||
TESTS = $(sort $(PROGS:%=%-nodepend))
|
||||
|
||||
include ../Mmake.common
|
||||
|
||||
excp_m1.runtest:
|
||||
|
||||
@@ -14,13 +14,15 @@ override EXTRA_MCFLAGS := $(patsubst --transitive-%,,$(EXTRA_MCFLAGS))
|
||||
#-----------------------------------------------------------------------------#
|
||||
|
||||
ifdef WORKSPACE_HAS_SUBDIRS
|
||||
TESTS = \
|
||||
ext_1-nodepend \
|
||||
ext_2-nodepend
|
||||
PROGS = \
|
||||
ext_1 \
|
||||
ext_2
|
||||
else
|
||||
TESTS =
|
||||
PROGS =
|
||||
endif
|
||||
|
||||
TESTS = $(sort $(PROGS:%=%-nodepend))
|
||||
|
||||
include ../Mmake.common
|
||||
|
||||
ext_1.runtest:
|
||||
|
||||
@@ -14,11 +14,13 @@ override EXTRA_MCFLAGS := $(patsubst --transitive-%,,$(EXTRA_MCFLAGS))
|
||||
#-----------------------------------------------------------------------------#
|
||||
|
||||
ifdef WORKSPACE_HAS_SUBDIRS
|
||||
TESTS = sharing_m1-nodepend
|
||||
PROGS = sharing_m1
|
||||
else
|
||||
TESTS =
|
||||
PROGS =
|
||||
endif
|
||||
|
||||
TESTS = $(sort $(PROGS:%=%-nodepend))
|
||||
|
||||
include ../Mmake.common
|
||||
|
||||
sharing_m1.runtest:
|
||||
|
||||
@@ -14,11 +14,13 @@ override EXTRA_MCFLAGS := $(patsubst --transitive-%,,$(EXTRA_MCFLAGS))
|
||||
#-----------------------------------------------------------------------------#
|
||||
|
||||
ifdef WORKSPACE_HAS_SUBDIRS
|
||||
TESTS = table_m1-nodepend
|
||||
PROGS = table_m1
|
||||
else
|
||||
TESTS =
|
||||
PROGS =
|
||||
endif
|
||||
|
||||
TESTS = $(sort $(PROGS:%=%-nodepend))
|
||||
|
||||
include ../Mmake.common
|
||||
|
||||
table_m1.runtest:
|
||||
|
||||
@@ -14,11 +14,13 @@ override EXTRA_MCFLAGS := $(patsubst --transitive-%,,$(EXTRA_MCFLAGS))
|
||||
#-----------------------------------------------------------------------------#
|
||||
|
||||
ifdef WORKSPACE_HAS_SUBDIRS
|
||||
TESTS = trail_m1-nodepend
|
||||
PROGS = trail_m1
|
||||
else
|
||||
TESTS =
|
||||
PROGS =
|
||||
endif
|
||||
|
||||
TESTS = $(sort $(PROGS:%=%-nodepend))
|
||||
|
||||
include ../Mmake.common
|
||||
|
||||
trail_m1.runtest:
|
||||
|
||||
@@ -14,11 +14,13 @@ override EXTRA_MCFLAGS := $(patsubst --transitive-%,,$(EXTRA_MCFLAGS))
|
||||
#-----------------------------------------------------------------------------#
|
||||
|
||||
ifdef WORKSPACE_HAS_SUBDIRS
|
||||
TESTS = ua_m1-nodepend
|
||||
PROGS = ua_m1
|
||||
else
|
||||
TESTS =
|
||||
PROGS =
|
||||
endif
|
||||
|
||||
TESTS = $(sort $(PROGS:%=%-nodepend))
|
||||
|
||||
include ../Mmake.common
|
||||
|
||||
ua_m1.runtest:
|
||||
|
||||
@@ -8,10 +8,12 @@ MAYBE_J1 =
|
||||
|
||||
#-----------------------------------------------------------------------------#
|
||||
|
||||
AUTOPAR_REPORTS = \
|
||||
PROGS = \
|
||||
mandelbrot \
|
||||
mmc
|
||||
|
||||
AUTOPAR_REPORTS = $(PROGS)
|
||||
|
||||
REPORTS = $(patsubst %,autopar_%,$(AUTOPAR_REPORTS))
|
||||
|
||||
TESTS = $(patsubst %,%-nodepend,$(sort $(REPORTS)))
|
||||
|
||||
@@ -463,7 +463,6 @@ endif
|
||||
NONSPECIAL_SINGLEMODULE_PROGS = \
|
||||
$(SINGLEMODULE_PROGS) \
|
||||
$(C_INTERFACE_PROGS) \
|
||||
$(TRAILED_PROGS) \
|
||||
$(TYPE_SPEC_PROGS)
|
||||
|
||||
SPECIAL_SINGLEMODULE_PROGS = \
|
||||
|
||||
@@ -93,9 +93,6 @@ realclean_recompilation:
|
||||
rm -f $$module.m $${module}_2.m ;\
|
||||
done
|
||||
|
||||
should_run_recompilation_tests:
|
||||
@echo $(RUN_RECOMPILATION_TESTS)
|
||||
|
||||
# Smart recompilation doesn't yet work with --intermodule-optimization.
|
||||
# The `override' is needed because otherwise make ignores the assignment if
|
||||
# EXTRA_MCFLAGS is set on the command line, as it is for the nightly tests.
|
||||
|
||||
Reference in New Issue
Block a user