diff options
| author | Richard Levitte <levitte@openssl.org> | 2023-12-05 09:21:35 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2023-12-07 07:38:21 +0100 |
| commit | f882753f43ff7d3e03dc53e6c7450a1308265628 (patch) | |
| tree | 9c4a0d55e979e962b4fb22ef46d9a1d4e5f7a0d1 /Configurations | |
| parent | f529a2eb75374946b60ed686ca6f90fdf244e787 (diff) | |
Make sure that the test / tests build target run 'run_tests' last
Fixes #22943
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Todd Short <todd.short@me.com>
(Merged from https://github.com/openssl/openssl/pull/22947)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 3 | ||||
| -rw-r--r-- | 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 828e1e91fb..e9fb13f24f 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 d67da63cea..f7e55b3abe 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) \ |