From: Dmitry Belyavskiy <beldmit@users.noreply.github.com>
Date: Mon, 28 Jan 2019 13:05:08 +0000 (+0300)
Subject: Merge pull request #108 from vt-alt/perl
X-Git-Tag: v3.0.0~311
X-Git-Url: http://www.wagner.pp.ru/gitweb/?a=commitdiff_plain;h=d0b341aa04b1871eee78cfbbe19900352f4ce1e7;hp=-c;p=openssl-gost%2Fengine.git

Merge pull request #108 from vt-alt/perl

run_tests: pass OPENSSL_ROOT_DIR into perl tests
---

d0b341aa04b1871eee78cfbbe19900352f4ce1e7
diff --combined CMakeLists.txt
index 8209687,408da4d..326b8f4
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -123,20 -123,15 +123,20 @@@ set(GOST_ENGINE_SOURCE_FILE
          gost_omac_acpkm.c
          )
  
 +add_executable(test_curves test_curves.c)
 +target_link_libraries(test_curves gost_engine gost_core ${OPENSSL_CRYPTO_LIBRARY})
 +add_test(NAME curves
 +	COMMAND test_curves)
 +
  add_executable(test_params test_params.c)
  target_link_libraries(test_params gost_engine gost_core ${OPENSSL_CRYPTO_LIBRARY})
  add_test(NAME parameters
  	COMMAND test_params)
  
 -add_executable(test_curves test_curves.c)
 -target_link_libraries(test_curves gost_engine gost_core ${OPENSSL_CRYPTO_LIBRARY})
 -add_test(NAME curves
 -	COMMAND test_curves)
 +add_executable(test_sign test_sign.c)
 +target_link_libraries(test_sign gost_engine gost_core ${OPENSSL_CRYPTO_LIBRARY})
 +add_test(NAME sign/verify
 +	COMMAND test_sign)
  
  add_executable(test_context test_context.c)
  target_link_libraries(test_context gost_engine gost_core ${OPENSSL_CRYPTO_LIBRARY})
@@@ -160,9 -155,10 +160,10 @@@ add_test(NAME gost8
  	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})