[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  d2068e34d1e6b19daa6aba32bc7c6393699c9371 (commit)
       via  41f571e10c31cd58aada3cfde3be6a8a94cea64a (commit)
       via  9b9a8a712d64e35a337b22869288f246b5580c73 (commit)
      from  0ed78e78007bb74e48e6f59fa2388bb244153bf0 (commit)


- Log -----------------------------------------------------------------
commit d2068e34d1e6b19daa6aba32bc7c6393699c9371
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Oct 9 17:58:50 2017 +0200

    Reduce the things we ignore in test/
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4507)

commit 41f571e10c31cd58aada3cfde3be6a8a94cea64a
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Oct 9 17:57:13 2017 +0200

    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 at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4507)

commit 9b9a8a712d64e35a337b22869288f246b5580c73
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Oct 9 17:55:38 2017 +0200

    Fix util/perl/OpenSSL/Test.pm input variable overwrite
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4507)

-----------------------------------------------------------------------

Summary of changes:
 .gitignore                           |  7 +------
 Configurations/descrip.mms.tmpl      |  2 ++
 Configurations/unix-Makefile.tmpl    |  4 +++-
 Configurations/windows-makefile.tmpl |  2 ++
 util/perl/OpenSSL/Test.pm            | 18 +++++++++---------
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 426e7fd..17572d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,12 +60,7 @@ Makefile
 /test/ossl_shim/ossl_shim
 
 # Certain files that get created by tests on the fly
-/test/*.ss
-/test/*.srl
-/test/.rnd
-/test/test*.pem
-/test/newkey.pem
-/test/*.log
+/test/test-runs
 /test/buildtest_*
 
 # Fuzz stuff.
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index a53e7c1..cfa055b 100644
--- 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 fea5be8..c9553cf 100644
--- 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 45b9c34..0ea1bba 100644
--- 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)
diff --git a/util/perl/OpenSSL/Test.pm b/util/perl/OpenSSL/Test.pm
index ffbb196..eb453a3 100644
--- a/util/perl/OpenSSL/Test.pm
+++ b/util/perl/OpenSSL/Test.pm
@@ -905,9 +905,9 @@ sub __test_file {
 
     my $e = pop || "";
     my $f = pop;
-    $f = catfile($directories{BLDTEST}, at _,$f . $e);
-    $f = catfile($directories{SRCTEST}, at _,$f) unless -f $f;
-    return $f;
+    my $out = catfile($directories{BLDTEST}, at _,$f . $e);
+    $out = catfile($directories{SRCTEST}, at _,$f) unless -f $out;
+    return $out;
 }
 
 sub __apps_file {
@@ -915,9 +915,9 @@ sub __apps_file {
 
     my $e = pop || "";
     my $f = pop;
-    $f = catfile($directories{BLDAPPS}, at _,$f . $e);
-    $f = catfile($directories{SRCAPPS}, at _,$f) unless -f $f;
-    return $f;
+    my $out = catfile($directories{BLDAPPS}, at _,$f . $e);
+    $out = catfile($directories{SRCAPPS}, at _,$f) unless -f $out;
+    return $out;
 }
 
 sub __fuzz_file {
@@ -925,9 +925,9 @@ sub __fuzz_file {
 
     my $e = pop || "";
     my $f = pop;
-    $f = catfile($directories{BLDFUZZ}, at _,$f . $e);
-    $f = catfile($directories{SRCFUZZ}, at _,$f) unless -f $f;
-    return $f;
+    my $out = catfile($directories{BLDFUZZ}, at _,$f . $e);
+    $out = catfile($directories{SRCFUZZ}, at _,$f) unless -f $out;
+    return $out;
 }
 
 sub __data_file {