diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index c44e876..a7d2fba 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -9,6 +9,8 @@ include_directories( ../apps/openssl/compat ) +add_definitions(-D_PATH_SSL_CA_FILE=\"${CMAKE_CURRENT_SOURCE_DIR}/../apps/openssl/cert.pem\") + # aeadtest add_executable(aeadtest aeadtest.c) target_link_libraries(aeadtest ${OPENSSL_LIBS}) @@ -196,15 +198,9 @@ add_test(mont mont) # ocsp_test if(ENABLE_EXTRATESTS) - if(NOT "${OPENSSLDIR}" STREQUAL "") - add_definitions(-D_PATH_SSL_CA_FILE=\"${OPENSSLDIR}/cert.pem\") - else() - add_definitions(-D_PATH_SSL_CA_FILE=\"${CMAKE_INSTALL_PREFIX}/etc/ssl/cert.pem\") - endif() add_executable(ocsp_test ocsp_test.c) target_link_libraries(ocsp_test ${OPENSSL_LIBS}) add_test(ocsptest ${CMAKE_CURRENT_SOURCE_DIR}/ocsptest.sh) - set_tests_properties(ocsptest PROPERTIES ENVIRONMENT "srcdir=${CMAKE_CURRENT_SOURCE_DIR}") endif() # optionstest diff --git a/tests/Makefile.am b/tests/Makefile.am index c229b66..aad86d9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -5,6 +5,7 @@ AM_CPPFLAGS += -I $(top_srcdir)/crypto/asn1 AM_CPPFLAGS += -I $(top_srcdir)/ssl AM_CPPFLAGS += -I $(top_srcdir)/apps/openssl AM_CPPFLAGS += -I $(top_srcdir)/apps/openssl/compat +AM_CPPFLAGS += -D_PATH_SSL_CA_FILE=\"$(top_srcdir)/apps/openssl/cert.pem\" LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) LDADD += $(abs_top_builddir)/ssl/libssl.la