Commit 41f571e1 authored by Richard Levitte's avatar Richard Levitte
Browse files

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: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4507)
parent 9b9a8a71

Configurations/descrip.mms.tmpl

+2 −0
Original line number Diff line number Diff line
@@ -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)"

Configurations/unix-Makefile.tmpl

+3 −1
Original line number Diff line number Diff line
@@ -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(); } "" -}

Configurations/windows-makefile.tmpl

+2 −0
Original line number Diff line number Diff line
@@ -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)