diff options
| author | Richard Levitte <richard@levitte.org> | 2021-05-01 08:36:55 +0200 |
|---|---|---|
| committer | Dmitry Belyavskiy <beldmit@users.noreply.github.com> | 2021-05-02 16:10:29 +0300 |
| commit | f3e84b52d2c5bf6774070b758714b90845d722d2 (patch) | |
| tree | 5f9c8683888285e8ec5c84ddf4e4ceb777c85b06 /CMakeLists.txt | |
| parent | 336c30e54ca42f54641ee06c9dce26ecd454b6ea (diff) | |
| download | gost-engine-f3e84b52d2c5bf6774070b758714b90845d722d2.zip gost-engine-f3e84b52d2c5bf6774070b758714b90845d722d2.tar.gz gost-engine-f3e84b52d2c5bf6774070b758714b90845d722d2.tar.bz2 | |
Make test programs less hard-coded
The following programs had a hard coded load of the gost engine.
This changes them to rely more on the testing environment, and to
load engines through configuration files.
This affects: test_ciphers.c, test_context.c, test_derive.c,
test_digest.c, test_params.c, test_sign.c, test_tls.c
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f6c8b5..ee1e080 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -183,15 +183,23 @@ set(GOST_ENGINE_SOURCE_FILES gost_eng.c ) +set(TEST_ENVIRONMENT + CMAKE_CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} + PERL5LIB=${CMAKE_CURRENT_SOURCE_DIR}/test + OPENSSL_ENGINES=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} + OPENSSL_PROGRAM=${OPENSSL_PROGRAM} + OPENSSL_CRYPTO_LIBRARY=${OPENSSL_CRYPTO_LIBRARY} + OPENSSL_CONF=${CMAKE_CURRENT_SOURCE_DIR}/test/engine.cnf + ) add_executable(test_digest test_digest.c) -target_link_libraries(test_digest gost_core ${OPENSSL_CRYPTO_LIBRARY}) -add_test(NAME digest - COMMAND test_digest) +target_link_libraries(test_digest ${OPENSSL_CRYPTO_LIBRARY}) +add_test(NAME digest COMMAND test_digest) +set_tests_properties(digest PROPERTIES ENVIRONMENT "${TEST_ENVIRONMENT}") add_executable(test_ciphers test_ciphers.c) -target_link_libraries(test_ciphers gost_core ${OPENSSL_CRYPTO_LIBRARY}) -add_test(NAME ciphers - COMMAND test_ciphers) +target_link_libraries(test_ciphers ${OPENSSL_CRYPTO_LIBRARY}) +add_test(NAME ciphers COMMAND test_ciphers) +set_tests_properties(ciphers PROPERTIES ENVIRONMENT "${TEST_ENVIRONMENT}") add_executable(test_curves test_curves.c) target_link_libraries(test_curves gost_core ${OPENSSL_CRYPTO_LIBRARY}) @@ -199,29 +207,29 @@ add_test(NAME curves COMMAND test_curves) add_executable(test_params test_params.c) -target_link_libraries(test_params gost_core ${OPENSSL_CRYPTO_LIBRARY}) -add_test(NAME parameters - COMMAND test_params) +target_link_libraries(test_params ${OPENSSL_CRYPTO_LIBRARY}) +add_test(NAME parameters COMMAND test_params) +set_tests_properties(parameters PROPERTIES ENVIRONMENT "${TEST_ENVIRONMENT}") add_executable(test_derive test_derive.c) -target_link_libraries(test_derive gost_core ${OPENSSL_CRYPTO_LIBRARY}) -add_test(NAME derive - COMMAND test_derive) +target_link_libraries(test_derive ${OPENSSL_CRYPTO_LIBRARY}) +add_test(NAME derive COMMAND test_derive) +set_tests_properties(derive PROPERTIES ENVIRONMENT "${TEST_ENVIRONMENT}") add_executable(test_sign test_sign.c) -target_link_libraries(test_sign gost_core ${OPENSSL_CRYPTO_LIBRARY}) -add_test(NAME sign/verify - COMMAND test_sign) +target_link_libraries(test_sign ${OPENSSL_CRYPTO_LIBRARY}) +add_test(NAME sign/verify COMMAND test_sign) +set_tests_properties(sign/verify PROPERTIES ENVIRONMENT "${TEST_ENVIRONMENT}") add_executable(test_tls test_tls.c) -target_link_libraries(test_tls gost_core ${OPENSSL_CRYPTO_LIBRARY} ${OPENSSL_SSL_LIBRARY}) -add_test(NAME TLS - COMMAND test_tls) +target_link_libraries(test_tls ${OPENSSL_CRYPTO_LIBRARY} ${OPENSSL_SSL_LIBRARY}) +add_test(NAME TLS COMMAND test_tls) +set_tests_properties(TLS PROPERTIES ENVIRONMENT "${TEST_ENVIRONMENT}") add_executable(test_context test_context.c) -target_link_libraries(test_context gost_core ${OPENSSL_CRYPTO_LIBRARY}) -add_test(NAME context - COMMAND test_context) +target_link_libraries(test_context ${OPENSSL_CRYPTO_LIBRARY}) +add_test(NAME context COMMAND test_context) +set_tests_properties(context PROPERTIES ENVIRONMENT "${TEST_ENVIRONMENT}") add_executable(test_keyexpimp test_keyexpimp.c) #target_compile_definitions(test_keyexpimp PUBLIC -DOPENSSL_LOAD_CONF) @@ -238,14 +246,6 @@ if(NOT SKIP_PERL_TESTS) execute_process(COMMAND perl -MTest2::V0 -e "" ERROR_QUIET RESULT_VARIABLE HAVE_TEST2_V0) if(NOT HAVE_TEST2_V0) - set(TEST_ENVIRONMENT - CMAKE_CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} - PERL5LIB=${CMAKE_CURRENT_SOURCE_DIR}/test - OPENSSL_ENGINES=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} - OPENSSL_PROGRAM=${OPENSSL_PROGRAM} - OPENSSL_CRYPTO_LIBRARY=${OPENSSL_CRYPTO_LIBRARY} - OPENSSL_CONF=${CMAKE_CURRENT_SOURCE_DIR}/test/empty.cnf - ) add_test(NAME engine COMMAND prove --merge -PWrapOpenSSL ${CMAKE_CURRENT_SOURCE_DIR}/test) set_tests_properties(engine PROPERTIES ENVIRONMENT "${TEST_ENVIRONMENT}") |