Fix clean target to remove test-runs directory

Fixes: #29931
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
MergeDate: Thu Feb 26 14:26:16 2026
(Merged from https://github.com/openssl/openssl/pull/30100)

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 318fb3289b448aea723ec1672174336703dfbb84..eff66e536f7fc891441e678cf145a3fc6cdc687e 100644 (file)
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -72,6 +72,7 @@ OPTIONS={- $config{options} -}
 CONFIGURE_ARGS=({- join(", ",quotify_l(@{$config{perlargv}})) -})
 SRCDIR={- $config{sourcedir} -}
 BLDDIR={- $config{builddir} -}
+RESULT_D=$(BLDDIR)/test-runs
 FIPSKEY={- $config{FIPSKEY} -}
 
 VERSION={- "$config{full_version}" -}
@@ -637,7 +638,7 @@ clean: libclean ## Clean the workspace, keep the configuration
        -find . -name '*{- platform->objext() -}' \! -name '.*' \! -type d -exec $(RM) {} \;
        $(RM) core
        $(RM) tags TAGS doc-nits md-nits
-       $(RM) -r test/test-runs
+       $(RM) -r $(RESULT_D)
        $(RM) providers/fips*.new
        -find . -type l \! -name '.*' \! -path './pkcs11-provider/*' -exec $(RM) {} \;
 

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index e9f985f8551649de3f9262fcc8120d4e9e112da8..d6704364af2be4b5bb63b2e40c7b8af76f87c942 100644 (file)
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -38,6 +38,7 @@
 PLATFORM={- $config{target} -}
 SRCDIR={- $config{sourcedir} -}
 BLDDIR={- $config{builddir} -}
+RESULT_D=$(BLDDIR)\test-runs
 FIPSKEY={- $config{FIPSKEY} -}
 
 VERSION={- "$config{full_version}" -}
@@ -464,7 +465,7 @@ clean: libclean
        -del /Q /S /F *.d *.obj *.pdb *.ilk *.manifest
        -del /Q /S /F apps\*.lib apps\*.rc apps\*.res apps\*.exp
        -del /Q /S /F test\*.exp
-       -rd /Q /S test\test-runs
+       -@if exist "$(RESULT_D)" rd /Q /S "$(RESULT_D)"
 
 distclean: clean
        -del /Q /F include\openssl\configuration.h