autotools: minor fixes and improvements

- Makefile.am: add root `test-quiet` target that maps to
  `tests/quiet-test`, for completeness.
  Ref: #22098

- tests/Makefile.am: drop unused remains of `MANFILES`.
  Follow-up to fa3f889752e6b5034966de61a372a60773a69ca8 #17463
  Also replace the `distclean` target to delete `CLEANFILES`, otherwise
  the CI dist job fails. (I'm not grokking why)

- tests/Makefile.am: sync up `tests` target with CMake, to pass `TFLAGS`
  `-a`.
  Follow-up to 904e7ecb66519951681377758fe6b07dde28ce36 #19347

- tests/certs/Makefile.am: fix to clean generated certs via `CLEANFILES`
  to comply with autotools documentation, which says the previously used
  variable `DISTCLEANFILES` is meant for files created by `./configure`.
  Ref: https://www.gnu.org/software/automake/manual/html_node/Clean.html
  Follow-up to 44341e736a3e2f7a2b25a774be3a9796e81abab9 #16824

- tests/http/Makefile.am: add `./` prefix to glob passed to `rm -rf` on
  clean, to avoid deleting unintented files, or pass unintended options.
  Follow-up to 671158242db32032a41e8da89da33d773b481ef8 #10349

Cherry-picked from #22102
Cherry-picked from #22150

Closes #22154

diff --git a/Makefile.am b/Makefile.am
index 83fdadf035fe01e3df809c3a16cb3dc0b2398579..08828fd4093e7460ccd7c78bea1f39d8935754e4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -88,6 +88,7 @@ dist-hook:
 check: test examples check-docs
 
 if CROSSCOMPILING
+test-quiet: test
 test-full: test
 test-nonflaky: test
 test-torture: test
@@ -102,7 +103,9 @@ test:
 
 else
 
-test:
+test: test-quiet
+
+test-quiet:
        @(cd tests; $(MAKE) all quiet-test)
 
 test-full:

diff --git a/tests/Makefile.am b/tests/Makefile.am
index a77c6259eba8928c09cd42d50042c0b4e44fbf3e..c76c0c802356bc8e94a6788c2524a3aeeb76ffb0 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -118,6 +118,7 @@ TEST_COMMON += !documentation
 endif
 
 TEST = srcdir=$(srcdir) @PERL@ $(PERLFLAGS) $(srcdir)/runtests.pl $(TEST_COMMON)
+TEST_A = -a
 TEST_Q = -a -s
 TEST_AM = -a -am
 TEST_F = -a -p -r
@@ -142,7 +143,8 @@ build-certs: perlcheck
        (cd certs && $(MAKE))
 
 # alias for 'test' to match CMake, where 'test' is a reserved target
-tests: test
+tests: perlcheck all
+       $(TEST) $(TEST_A) $(TFLAGS)
 
 test: perlcheck all
        $(TEST) $(TFLAGS)
@@ -179,7 +181,7 @@ checksrc:
        (cd tunit && $(MAKE) checksrc)
        (cd server && $(MAKE) checksrc)
 
-all-local: $(MANFILES) build-certs
+all-local: build-certs
 
 distclean:
-       rm -f $(MANFILES)
+       rm -f $(CLEANFILES)

diff --git a/tests/certs/Makefile.am b/tests/certs/Makefile.am
index 078b4490b6e20f8f99103d20a178ede2a2c9d666..a88f474175154e5faa8d21d8f04f200eaabc06e8 100644 (file)
--- a/tests/certs/Makefile.am
+++ b/tests/certs/Makefile.am
@@ -29,7 +29,7 @@ include Makefile.inc
 EXTRA_DIST = $(CERTCONFIG_CA) $(CERTCONFIGS) $(SRPFILES) CMakeLists.txt \
   genserv.pl
 
-DISTCLEANFILES = $(GENERATEDCERTS)
+CLEANFILES = $(GENERATEDCERTS)
 
 all-am: test-ca.cacert
 

diff --git a/tests/http/Makefile.am b/tests/http/Makefile.am
index 7232c1e8aa15dff831c523aaead6d688e4e29d4e..6b4b6054ebf7aef3b2d2c1aeadfad9979985b38c 100644 (file)
--- a/tests/http/Makefile.am
+++ b/tests/http/Makefile.am
@@ -77,7 +77,7 @@ EXTRA_DIST =             \
   $(TESTENV)
 
 clean-local:
-       rm -rf *.pyc __pycache__
+       rm -rf ./*.pyc __pycache__
        rm -rf gen
 
 check: libtests