Use the possibility to have test results in a different directory

RESULT_D can be used to provide a separate directory for test results.
Let's use that to separate them from other files.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4507)

diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index a53e7c1b831c9cca86ed51bfb0e1d40af6abc749..cfa055b72d4eb96d3c95fa386a11f170e4b09d44 100644 (file)
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -277,8 +277,10 @@ test : tests
 {- dependmagic('tests'); -} : build_programs_nodep, build_engines_nodep
         @ ! {- output_off() if $disabled{tests}; "" -}
         SET DEFAULT [.test]{- move("test") -}
+        CREATE/DIR [.test-runs]
         DEFINE SRCTOP {- sourcedir() -}
         DEFINE BLDTOP {- builddir() -}
+        DEFINE RESULT_D {- builddir(qw(test test-runs)) -}
         DEFINE OPENSSL_ENGINES {- builddir("engines") -}
         DEFINE OPENSSL_DEBUG_MEMORY "on"
         IF "$(VERBOSE)" .NES. "" THEN DEFINE VERBOSE "$(VERBOSE)"

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index fea5be840746113386d3265bac887fed985b7281..c9553cf6f731c74e962a20ad7def0ee2c5c1d4b3 100644 (file)
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -263,11 +263,13 @@ test: tests
 {- dependmagic('tests'); -}: build_programs_nodep build_engines_nodep link-utils
        @ : {- output_off() if $disabled{tests}; "" -}
        ( cd test; \
+         mkdir -p test-runs; \
          SRCTOP=../$(SRCDIR) \
          BLDTOP=../$(BLDDIR) \
+         RESULT_D=test-runs \
          PERL="$(PERL)" \
          EXE_EXT={- $exeext -} \
-         OPENSSL_ENGINES=../$(BLDDIR)/engines \
+         OPENSSL_ENGINES=`cd ../$(BLDDIR)/engines; pwd` \
          OPENSSL_DEBUG_MEMORY=on \
            $(PERL) ../$(SRCDIR)/test/run_tests.pl $(TESTS) )
        @ : {- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -}

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 45b9c3416e11a0a3e64b4f292d9c93f806510cf8..0ea1bbab95d73b0cc954928e2c2d4bf3695ba991 100644 (file)
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -214,8 +214,10 @@ build_all_generated: $(GENERATED_MANDATORY) $(GENERATED)
 test: tests
 {- dependmagic('tests'); -}: build_programs_nodep build_engines_nodep
        @rem {- output_off() if $disabled{tests}; "" -}
+       -mkdir $(BLDDIR)\test\test-runs
        set SRCTOP=$(SRCDIR)
        set BLDTOP=$(BLDDIR)
+       set RESULT_D=$(BLDDIR)\test\test-runs
        set PERL=$(PERL)
        set OPENSSL_DEBUG_MEMORY=on
        "$(PERL)" "$(SRCDIR)\test\run_tests.pl" $(TESTS)