Commit 3fdeb5dc8e for openssl.org

commit 3fdeb5dc8ea3ac1040692c86127309652c47ac52
Author: William Faber <wmf1426@rit.edu>
Date:   Thu Feb 19 16:50:46 2026 -0500

    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 318fb3289b..eff66e536f 100644
--- 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 e9f985f855..d6704364af 100644
--- 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