Merge pull request #108 from vt-alt/perl

run_tests: pass OPENSSL_ROOT_DIR into perl tests

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8209687f6d1c33afe833bd0f6414d8d70989c285..326b8f40ce7e9fd9f68c8f39f8fb4037a877d6dc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -160,9 +160,10 @@ add_test(NAME gost89
        COMMAND test_gost89)
 
 add_test(NAME engine
-        COMMAND perl run_tests
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/test)
-set_tests_properties(engine PROPERTIES ENVIRONMENT OPENSSL_ENGINES=${OUTPUT_DIRECTORY})
+       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}")
 
 add_executable(sign benchmark/sign.c)
 target_link_libraries(sign gost_engine gost_core ${OPENSSL_CRYPTO_LIBRARY})

diff --git a/test/run_tests b/test/run_tests
index 3578d0a62073556833fb224785cc1b319815922c..3dfa90c8bebb5488d0a7c13880ef5399e55ee48b 100644 (file)
--- a/test/run_tests
+++ b/test/run_tests
@@ -1,5 +1,9 @@
 #!/usr/bin/perl
 use TAP::Harness;
 
+if(defined $ENV{'OPENSSL_ROOT_DIR'} && !defined $ENV{'LD_LIBRARY_PATH'}) {
+  $ENV{'LD_LIBRARY_PATH'} = $ENV{'OPENSSL_ROOT_DIR'};
+  $ENV{'PATH'} = "$ENV{'OPENSSL_ROOT_DIR'}/apps:$ENV{'PATH'}";
+}
 my $harness = TAP::Harness->new();
 exit ($harness->runtests(glob("*.t"))->all_passed() ? 0 : 1);