[openssl-commits] [openssl] OpenSSL_1_1_0-stable update
Richard Levitte
levitte at openssl.org
Mon Oct 9 19:23:50 UTC 2017
The branch OpenSSL_1_1_0-stable has been updated
via 24806f0944d48498cf6c28e3b7b3661416bc1470 (commit)
via 6b3c5b898eb0d9bbaf192c84ade90346bc49899e (commit)
via 380ebcc89776ffd7acb2b624cb95ded081e43ae4 (commit)
from 8bd108a0042a75cca34de4f803f6aa62299d0463 (commit)
- Log -----------------------------------------------------------------
commit 24806f0944d48498cf6c28e3b7b3661416bc1470
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)
(cherry picked from commit d2068e34d1e6b19daa6aba32bc7c6393699c9371)
commit 6b3c5b898eb0d9bbaf192c84ade90346bc49899e
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)
(cherry picked from commit 41f571e10c31cd58aada3cfde3be6a8a94cea64a)
commit 380ebcc89776ffd7acb2b624cb95ded081e43ae4
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)
(cherry picked from commit 9b9a8a712d64e35a337b22869288f246b5580c73)
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 7 +------
Configurations/descrip.mms.tmpl | 2 ++
Configurations/unix-Makefile.tmpl | 4 +++-
Configurations/windows-makefile.tmpl | 2 ++
test/testlib/OpenSSL/Test.pm | 30 +++++++++++++++---------------
5 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/.gitignore b/.gitignore
index 2190a09..7324bda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,12 +53,7 @@ Makefile
/test/v3ext
# 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 92eda9e..6f6a9ac 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -268,8 +268,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 c420e69..3dd09c2 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -244,11 +244,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 90828f5..090a602 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -204,8 +204,10 @@ build_apps build_tests: build_programs
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/test/testlib/OpenSSL/Test.pm b/test/testlib/OpenSSL/Test.pm
index e9d02aa..f8805a6 100644
--- a/test/testlib/OpenSSL/Test.pm
+++ b/test/testlib/OpenSSL/Test.pm
@@ -793,45 +793,45 @@ sub __test_file {
BAIL_OUT("Must run setup() first") if (! $test_name);
my $f = pop;
- $f = catfile($directories{BLDTEST}, at _,$f . __exeext());
- $f = catfile($directories{SRCTEST}, at _,$f) unless -x $f;
- return $f;
+ my $out = catfile($directories{BLDTEST}, at _,$f . __exeext());
+ $out = catfile($directories{SRCTEST}, at _,$f) unless -x $out;
+ return $out;
}
sub __perltest_file {
BAIL_OUT("Must run setup() first") if (! $test_name);
my $f = pop;
- $f = catfile($directories{BLDTEST}, at _,$f);
- $f = catfile($directories{SRCTEST}, at _,$f) unless -f $f;
- return ($^X, $f);
+ my $out = catfile($directories{BLDTEST}, at _,$f);
+ $out = catfile($directories{SRCTEST}, at _,$f) unless -f $out;
+ return ($^X, $out);
}
sub __apps_file {
BAIL_OUT("Must run setup() first") if (! $test_name);
my $f = pop;
- $f = catfile($directories{BLDAPPS}, at _,$f . __exeext());
- $f = catfile($directories{SRCAPPS}, at _,$f) unless -x $f;
- return $f;
+ my $out = catfile($directories{BLDAPPS}, at _,$f . __exeext());
+ $out = catfile($directories{SRCAPPS}, at _,$f) unless -x $out;
+ return $out;
}
sub __fuzz_file {
BAIL_OUT("Must run setup() first") if (! $test_name);
my $f = pop;
- $f = catfile($directories{BLDFUZZ}, at _,$f . __exeext());
- $f = catfile($directories{SRCFUZZ}, at _,$f) unless -x $f;
- return $f;
+ my $out = catfile($directories{BLDFUZZ}, at _,$f . __exeext());
+ $out = catfile($directories{SRCFUZZ}, at _,$f) unless -x $out;
+ return $out;
}
sub __perlapps_file {
BAIL_OUT("Must run setup() first") if (! $test_name);
my $f = pop;
- $f = catfile($directories{BLDAPPS}, at _,$f);
- $f = catfile($directories{SRCAPPS}, at _,$f) unless -f $f;
- return ($^X, $f);
+ my $out = catfile($directories{BLDAPPS}, at _,$f);
+ $out = catfile($directories{SRCAPPS}, at _,$f) unless -f $out;
+ return ($^X, $out);
}
sub __data_file {
More information about the openssl-commits
mailing list