Merge pull request #166 from levitte/cleanup-tests

Cleanup tests

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a85c86eeba55e74e3da7449bd71197a90f1c7653..407302b452dc500a7891b8f63e12f775c0eb6393 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -189,7 +189,7 @@ add_test(NAME engine
        COMMAND perl run_tests
        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/test)
 set_tests_properties(engine PROPERTIES ENVIRONMENT
-       "OPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR};OPENSSL_ENGINES=${OUTPUT_DIRECTORY}")
+       "OPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR};OPENSSL_ENGINES=${OUTPUT_DIRECTORY};OPENSSL_CONF=${CMAKE_SOURCE_DIR}/test/empty.cnf")
 endif()
 
 add_executable(sign benchmark/sign.c)

diff --git a/test/00-engine.t b/test/00-engine.t
index e6685aac8360c551d8c806bb983a2a27a7f23cc3..7c3c985748e63058c430fd9058249689f501540d 100644 (file)
--- a/test/00-engine.t
+++ b/test/00-engine.t
@@ -9,11 +9,6 @@ open (my $F,">","testdata.dat");
 print $F "12345670" x 128;
 close $F;
 
-# Set OPENSSL_ENGINES environment variable to just built engine
-if(!defined $ENV{'OPENSSL_ENGINES'}){
-       $ENV{'OPENSSL_ENGINES'} = abs_path("../.libs");
-}
-
 my $key='0123456789abcdef' x 2;
 
 #

diff --git a/test/01-digest.t b/test/01-digest.t
index 63cd97306fbb3f93760bb6bc98baeb8609794e37..b3a6355ca6c39eeb85a3f5f33e0a1d8a47cf3aa6 100644 (file)
--- a/test/01-digest.t
+++ b/test/01-digest.t
@@ -1,12 +1,7 @@
 #!/usr/bin/perl 
 use Test2::V0;
 plan(16);
-use Cwd 'abs_path';
 
-# Set OPENSSL_ENGINES environment variable to just built engine
-if(!defined $ENV{'OPENSSL_ENGINES'}){
-        $ENV{'OPENSSL_ENGINES'} = abs_path("../.libs");
-}
 # Set engine name from environment to allow testing of different engines
 my $engine=$ENV{'ENGINE_NAME'}||"gost";
 # Reopen STDERR to eliminate extra output

diff --git a/test/02-mac.t b/test/02-mac.t
index f3bbe99f4702e4a0249643ceffc8ff56a478758a..9dca47e133d220684890594bbd51a0899be53c34 100644 (file)
--- a/test/02-mac.t
+++ b/test/02-mac.t
@@ -1,7 +1,6 @@
 #!/usr/bin/perl 
 use Test2::V0;
 plan(19);
-use Cwd 'abs_path';
 
 # prepare data for 
 my $F;
@@ -12,10 +11,6 @@ close $F;
 open $F,">","testbig.dat";
 print $F ("12345670" x 8 . "\n") x  4096;
 close $F;
-# Set OPENSSL_ENGINES environment variable to just built engine
-if(!defined $ENV{'OPENSSL_ENGINES'}){
-        $ENV{'OPENSSL_ENGINES'} = abs_path("../.libs");
-}
 
 my $key='0123456789abcdef' x 2;
 

diff --git a/test/03-encrypt.t b/test/03-encrypt.t
index 6b1d593f33455207f2afcce2b19ab836b81e38a7..408278ac9d4c736631aa5d286a43516e16eafdf7 100644 (file)
--- a/test/03-encrypt.t
+++ b/test/03-encrypt.t
@@ -11,12 +11,6 @@ my $use_config = 1;
 
 # prepare data for 
 
-
-# Set OPENSSL_ENGINES environment variable to just built engine
-if(!defined $ENV{'OPENSSL_ENGINES'}){
-        $ENV{'OPENSSL_ENGINES'} = abs_path("../.libs");
-}
-
 my $key='0123456789abcdef' x 2;
 
 #

diff --git a/test/04-pkey.t b/test/04-pkey.t
index c202b2e8561e57e036aeccd92a8d004447d0c225..549d6572d341c181a82ad436331e0bca73ad1a06 100644 (file)
--- a/test/04-pkey.t
+++ b/test/04-pkey.t
@@ -12,11 +12,6 @@ my $use_config = 1;
 # prepare data for 
 
 
-# Set OPENSSL_ENGINES environment variable to just built engine
-if(!defined $ENV{'OPENSSL_ENGINES'}){
-        $ENV{'OPENSSL_ENGINES'} = abs_path("../.libs");
-}
-
 my $engine=$ENV{'ENGINE_NAME'}||"gost";
 
 # Reopen STDERR to eliminate extra output

diff --git a/test/empty.cnf b/test/empty.cnf
new file mode 100644 (file)
index 0000000..e69de29