diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2021-04-16 17:51:55 +0200 |
|---|---|---|
| committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2021-05-13 11:13:17 +0200 |
| commit | c612c7a455d9b3ea602c87fe720d09535f1f6e37 (patch) | |
| tree | e2c4a648118aef877ba8fdd4b4fe470e50119a43 /Configurations/unix-Makefile.tmpl | |
| parent | 8f3683cda197cd3df1005dc058a2d57be0b6cc5a (diff) | |
| download | openssl-new-c612c7a455d9b3ea602c87fe720d09535f1f6e37.tar.gz | |
Makefile: Simplify use of run_tests
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14901)
Diffstat (limited to 'Configurations/unix-Makefile.tmpl')
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 11 |
1 files changed, 4 insertions, 7 deletions
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 |