style: prefer %D% in Automake files

* tests/local.mk: Prefer %D%/ to tests/.
This commit is contained in:
Akim Demaille
2018-09-16 15:29:37 +02:00
parent 84dcd7991b
commit d4fbda2a94

View File

@@ -17,14 +17,14 @@
EXTRA_DIST += $(TESTSUITE_AT) tests/testsuite EXTRA_DIST += $(TESTSUITE_AT) tests/testsuite
DISTCLEANFILES += tests/atconfig $(check_SCRIPTS) DISTCLEANFILES += %D%/atconfig $(check_SCRIPTS)
MAINTAINERCLEANFILES += $(TESTSUITE) MAINTAINERCLEANFILES += $(TESTSUITE)
## ------------ ## ## ------------ ##
## package.m4. ## ## package.m4. ##
## ------------ ## ## ------------ ##
$(top_srcdir)/tests/package.m4: $(top_srcdir)/configure $(top_srcdir)/%D%/package.m4: $(top_srcdir)/configure
$(AM_V_GEN)rm -f $@ $@.tmp $(AM_V_GEN)rm -f $@ $@.tmp
$(AM_V_at){ \ $(AM_V_at){ \
echo '# Signature of the current package.'; \ echo '# Signature of the current package.'; \
@@ -40,41 +40,41 @@ $(top_srcdir)/tests/package.m4: $(top_srcdir)/configure
## Generate the test suite. ## ## Generate the test suite. ##
## ------------------------- ## ## ------------------------- ##
TESTSUITE_AT = \ TESTSUITE_AT = \
tests/testsuite.at \ %D%/testsuite.at \
\ \
tests/actions.at \ %D%/actions.at \
tests/c++.at \ %D%/c++.at \
tests/calc.at \ %D%/calc.at \
tests/conflicts.at \ %D%/conflicts.at \
tests/cxx-type.at \ %D%/cxx-type.at \
tests/existing.at \ %D%/existing.at \
tests/glr-regression.at \ %D%/glr-regression.at \
tests/headers.at \ %D%/headers.at \
tests/input.at \ %D%/input.at \
tests/java.at \ %D%/java.at \
tests/javapush.at \ %D%/javapush.at \
tests/local.at \ %D%/local.at \
tests/named-refs.at \ %D%/named-refs.at \
tests/output.at \ %D%/output.at \
tests/package.m4 \ %D%/package.m4 \
tests/push.at \ %D%/push.at \
tests/reduce.at \ %D%/reduce.at \
tests/regression.at \ %D%/regression.at \
tests/report.at \ %D%/report.at \
tests/sets.at \ %D%/sets.at \
tests/skeletons.at \ %D%/skeletons.at \
tests/synclines.at \ %D%/synclines.at \
tests/torture.at \ %D%/torture.at \
tests/types.at %D%/types.at
TESTSUITE = $(top_srcdir)/tests/testsuite TESTSUITE = $(top_srcdir)/%D%/testsuite
AUTOTEST = $(AUTOM4TE) --language=autotest AUTOTEST = $(AUTOM4TE) --language=autotest
AUTOTESTFLAGS = -I $(top_srcdir)/tests AUTOTESTFLAGS = -I $(top_srcdir)/%D%
$(TESTSUITE): $(TESTSUITE_AT) $(TESTSUITE): $(TESTSUITE_AT)
$(AM_V_GEN) \ $(AM_V_GEN) \
$(AUTOTEST) $(AUTOTESTFLAGS) $(srcdir)/tests/testsuite.at -o $@.tmp $(AUTOTEST) $(AUTOTESTFLAGS) $(srcdir)/%D%/testsuite.at -o $@.tmp
$(AM_V_at)$(PERL) -pi -e 's/\@tb\@/\t/g' $@.tmp $(AM_V_at)$(PERL) -pi -e 's/\@tb\@/\t/g' $@.tmp
$(AM_V_at)mv $@.tmp $@ $(AM_V_at)mv $@.tmp $@
@@ -83,14 +83,14 @@ $(TESTSUITE): $(TESTSUITE_AT)
## Run the test suite. ## ## Run the test suite. ##
## -------------------- ## ## -------------------- ##
# Move into tests/ so that testsuite.dir etc. be created there. # Move into %D%/ so that testsuite.dir etc. be created there.
RUN_TESTSUITE = $(TESTSUITE) -C tests $(TESTSUITEFLAGS) RUN_TESTSUITE = $(TESTSUITE) -C %D% $(TESTSUITEFLAGS)
check_SCRIPTS = $(BISON) tests/atconfig tests/atlocal check_SCRIPTS = $(BISON) %D%/atconfig %D%/atlocal
RUN_TESTSUITE_deps = all $(TESTSUITE) $(check_SCRIPTS) RUN_TESTSUITE_deps = all $(TESTSUITE) $(check_SCRIPTS)
clean-local: clean-local-tests clean-local: clean-local-tests
clean-local-tests: clean-local-tests:
test ! -f $(TESTSUITE) || $(TESTSUITE) -C tests --clean test ! -f $(TESTSUITE) || $(TESTSUITE) -C %D% --clean
check-local: $(RUN_TESTSUITE_deps) check-local: $(RUN_TESTSUITE_deps)
$(RUN_TESTSUITE) $(RUN_TESTSUITE)