From 9268d9aceb8b31e0bd6d7737f1a54175e997e57c Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim.demaille@gmail.com>
Date: Thu, 6 Sep 2018 18:18:58 +0200
Subject: [PATCH] tests: fix target naming convention

We have some maintainer-check-foo and some maintainer-foo-check.  Keep
only the former.

* tests/local.mk (maintainer-push-check, maintainer-xml-check)
(maintainer-release-check): Rename as...
(maintainer-check-push, maintainer-check-xml)
(maintainer-check-release): these.
---
 README-hacking |  8 ++++----
 cfg.mk         |  6 +++---
 tests/local.mk | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/README-hacking b/README-hacking
index fcc6102a..56761c1c 100644
--- a/README-hacking
+++ b/README-hacking
@@ -259,19 +259,19 @@ release:
   - runs the parsers under Valgrind.
   - runs the test suite with G++ as C compiler...
 
-- run "make maintainer-push-check", which runs "make maintainer-check" while
+- run "make maintainer-check-push", which runs "make maintainer-check" while
   activating the push implementation and its pull interface wrappers in many
   test cases that were originally written to exercise only the pull
   implementation.  This makes certain the push implementation can perform
   every task the pull implementation can.
 
-- run "make maintainer-xml-check", which runs "make maintainer-check" while
+- run "make maintainer-check-xml", which runs "make maintainer-check" while
   checking Bison's XML automaton report for every working grammar passed to
   Bison in the test suite.  The check just diffs the output of Bison's
   included XSLT style sheets with the output of --report=all and --graph.
 
-- running "make maintainer-release-check" takes care of running
-  maintainer-check, maintainer-push-check and maintainer-xml-check.
+- running "make maintainer-check-release" takes care of running
+  maintainer-check, maintainer-check-push and maintainer-check-xml.
 
 - Change tests/atlocal/CFLAGS to add your preferred options.  For instance,
   "-traditional" to check that the parsers are K&R.  Note that it does not
diff --git a/cfg.mk b/cfg.mk
index f568a4e7..bd117e0f 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -26,11 +26,11 @@ regen: _version
 manual_title = The Yacc-compatible Parser Generator
 gendocs_options_ = -I $(abs_top_srcdir)/doc -I $(abs_top_builddir)/doc
 
-# It's useful to run maintainer-*check* targets during development, but we
+# It's useful to run maintainer-check* targets during development, but we
 # don't want to wait on a recompile because of an update to $(VERSION).  Thus,
-# override the _is-dist-target from GNUmakefile so that maintainer-*check*
+# override the _is-dist-target from GNUmakefile so that maintainer-check*
 # targets are filtered out.
-_is-dist-target = $(filter-out %clean maintainer-check% maintainer-%-check, \
+_is-dist-target = $(filter-out %clean maintainer-check%, \
   $(filter maintainer-% dist% alpha beta major,$(MAKECMDGOALS)))
 
 url_dir_list = \
diff --git a/tests/local.mk b/tests/local.mk
index da674df7..3c7444aa 100644
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -120,15 +120,15 @@ maintainer-check-valgrind: $(RUN_TESTSUITE_deps)
 .PHONY: maintainer-check
 maintainer-check: maintainer-check-posix maintainer-check-valgrind maintainer-check-g++
 
-.PHONY: maintainer-push-check
-maintainer-push-check:
+.PHONY: maintainer-check-push
+maintainer-check-push:
 	$(MAKE) $(AM_MAKEFLAGS) maintainer-check			\
 	  TESTSUITEFLAGS='BISON_USE_PUSH_FOR_PULL=1 $(TESTSUITEFLAGS)'
 
-.PHONY: maintainer-xml-check
-maintainer-xml-check:
+.PHONY: maintainer-check-xml
+maintainer-check-xml:
 	$(MAKE) $(AM_MAKEFLAGS) maintainer-check		\
 	  TESTSUITEFLAGS='BISON_TEST_XML=1 $(TESTSUITEFLAGS)'
 
-.PHONY: maintainer-release-check
-maintainer-release-check: maintainer-check maintainer-push-check maintainer-xml-check
+.PHONY: maintainer-check-release
+maintainer-check-release: maintainer-check maintainer-check-push maintainer-check-xml