]> www.wagner.pp.ru Git - openssl-gost/engine.git/commitdiff
Merge pull request #108 from vt-alt/perl
authorDmitry Belyavskiy <beldmit@users.noreply.github.com>
Mon, 28 Jan 2019 13:05:08 +0000 (16:05 +0300)
committerGitHub <noreply@github.com>
Mon, 28 Jan 2019 13:05:08 +0000 (16:05 +0300)
run_tests: pass OPENSSL_ROOT_DIR into perl tests

1  2 
CMakeLists.txt

diff --combined CMakeLists.txt
index 8209687f6d1c33afe833bd0f6414d8d70989c285,408da4d00b93d576d75d22f7d6786baf3e5344e2..326b8f40ce7e9fd9f68c8f39f8fb4037a877d6dc
@@@ -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})