From f882753f43ff7d3e03dc53e6c7450a1308265628 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Tue, 5 Dec 2023 09:21:35 +0100 Subject: [PATCH] Make sure that the test / tests build target run 'run_tests' last Fixes #22943 Reviewed-by: Tomas Mraz Reviewed-by: Todd Short (Merged from https://github.com/openssl/openssl/pull/22947) --- Configurations/descrip.mms.tmpl | 3 ++- Configurations/unix-Makefile.tmpl | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 828e1e91fbb..e9fb13f24fa 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -516,7 +516,8 @@ build_all_generated : $(GENERATED_MANDATORY) $(GENERATED) build_docs all : build_sw build_docs test : tests -{- dependmagic('tests'); -} : build_programs_nodep, build_modules_nodep run_tests +{- dependmagic('tests'); -} : build_programs_nodep, build_modules_nodep + $(MMS) $(MMSQUALIFIERS) run_tests run_tests : @ ! {- output_off() if $disabled{tests}; "" -} DEFINE SRCTOP "$(SRCDIR)" diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index d67da63ceac..f7e55b3abea 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -559,8 +559,9 @@ help: ## Show this help screen ##@ Testing test: tests ## Run tests (alias of "tests") -{- dependmagic('tests', 'Run tests'); -}: build_programs_nodep build_modules_nodep link-utils run_tests -run_tests: +{- dependmagic('tests', 'Run tests'); -}: build_programs_nodep build_modules_nodep link-utils + $(MAKE) run_tests +run_tests: FORCE @ : {- output_off() if $disabled{tests}; "" -} ( SRCTOP=$(SRCDIR) \ BLDTOP=$(BLDDIR) \ -- 2.47.2