root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

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)
This commit is contained in:
Richard Levitte 2017-10-09 17:57:13 +02:00
parent 9b9a8a712d
commit 41f571e10c
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Configurations/descrip.mms.tmpl
View File

@ -277,8 +277,10 @@ test : tests
{- dependmagic('tests'); -} : build_programs_nodep, build_engines_nodep {- dependmagic('tests'); -} : build_programs_nodep, build_engines_nodep
@ ! {- output_off() if $disabled{tests}; "" -} @ ! {- output_off() if $disabled{tests}; "" -}
SET DEFAULT [.test]{- move("test") -} SET DEFAULT [.test]{- move("test") -}
CREATE/DIR [.test-runs]
DEFINE SRCTOP {- sourcedir() -} DEFINE SRCTOP {- sourcedir() -}
DEFINE BLDTOP {- builddir() -} DEFINE BLDTOP {- builddir() -}
DEFINE RESULT_D {- builddir(qw(test test-runs)) -}
DEFINE OPENSSL_ENGINES {- builddir("engines") -} DEFINE OPENSSL_ENGINES {- builddir("engines") -}
DEFINE OPENSSL_DEBUG_MEMORY "on" DEFINE OPENSSL_DEBUG_MEMORY "on"
IF "$(VERBOSE)" .NES. "" THEN DEFINE VERBOSE "$(VERBOSE)" IF "$(VERBOSE)" .NES. "" THEN DEFINE VERBOSE "$(VERBOSE)"

4
Configurations/unix-Makefile.tmpl
View File

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

2
Configurations/windows-makefile.tmpl
View File

@ -214,8 +214,10 @@ build_all_generated: $(GENERATED_MANDATORY) $(GENERATED)
test: tests test: tests
{- dependmagic('tests'); -}: build_programs_nodep build_engines_nodep {- dependmagic('tests'); -}: build_programs_nodep build_engines_nodep
@rem {- output_off() if $disabled{tests}; "" -} @rem {- output_off() if $disabled{tests}; "" -}
-mkdir $(BLDDIR)\test\test-runs
set SRCTOP=$(SRCDIR) set SRCTOP=$(SRCDIR)
set BLDTOP=$(BLDDIR) set BLDTOP=$(BLDDIR)
set RESULT_D=$(BLDDIR)\test\test-runs
set PERL=$(PERL) set PERL=$(PERL)
set OPENSSL_DEBUG_MEMORY=on set OPENSSL_DEBUG_MEMORY=on
"$(PERL)" "$(SRCDIR)\test\run_tests.pl" $(TESTS) "$(PERL)" "$(SRCDIR)\test\run_tests.pl" $(TESTS)