mirror of
https://github.com/curl/curl.git
synced 2026-07-10 01:07:17 +03:00
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 tofa3f889752#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 to904e7ecb66#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 to44341e736a#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 to671158242d#10349 Cherry-picked from #22102 Cherry-picked from #22150 Closes #22154
This commit is contained in:
parent
ccf19d59e7
commit
2f4d3221aa
4 changed files with 11 additions and 6 deletions
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ EXTRA_DIST = \
|
|||
$(TESTENV)
|
||||
|
||||
clean-local:
|
||||
rm -rf *.pyc __pycache__
|
||||
rm -rf ./*.pyc __pycache__
|
||||
rm -rf gen
|
||||
|
||||
check: libtests
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue