From c612c7a455d9b3ea602c87fe720d09535f1f6e37 Mon Sep 17 00:00:00 2001 From: "Dr. David von Oheimb" Date: Fri, 16 Apr 2021 17:51:55 +0200 Subject: Makefile: Simplify use of run_tests Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/14901) --- Configurations/unix-Makefile.tmpl | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'Configurations') diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 3f78d6d5de..c07f8dd748 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -506,7 +506,8 @@ build_all_generated: $(GENERATED_MANDATORY) $(GENERATED) build_docs all: build_sw build_docs test: tests -{- dependmagic('tests'); -}: build_programs_nodep build_modules_nodep link-utils +{- dependmagic('tests'); -}: build_programs_nodep build_modules_nodep link-utils run_tests +run_tests: @ : {- output_off() if $disabled{tests}; "" -} ( SRCTOP=$(SRCDIR) \ BLDTOP=$(BLDDIR) \ @@ -520,8 +521,7 @@ test: tests list-tests: @ : {- output_off() if $disabled{tests}; "" -} - @SRCTOP="$(SRCDIR)" \ - $(PERL) $(SRCDIR)/test/run_tests.pl list + $(MAKE) run_tests TESTS=list @ : {- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -} @echo "Tests are not supported with your chosen Configure options" @ : {- output_on() if !$disabled{tests}; "" -} @@ -1254,10 +1254,7 @@ ordinals: build_generated $(SSLHEADERS) test_ordinals: - ( cd test; \ - SRCTOP=../$(SRCDIR) \ - BLDTOP=../$(BLDDIR) \ - $(PERL) ../$(SRCDIR)/test/run_tests.pl test_ordinals ) + $(MAKE) run_tests TESTS=test_ordinals tags TAGS: FORCE rm -f TAGS tags -- cgit v1.2.3