From 6b82af8052c6c2201767ea0c3bb936bd5818bf47 Mon Sep 17 00:00:00 2001 From: Theo Buehler Date: Sat, 31 May 2025 03:51:08 -0600 Subject: link tests that need it against test helpers --- tests/CMakeLists.txt | 7 +++++-- tests/Makefile.am | 8 ++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 8493614..861d8b2 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -65,6 +65,9 @@ function(add_platform_test TEST_NAME) endif() endfunction() +# XXX - should probably be in their own static lib +set(TEST_HELPER_SRC test.c test_util.c) + # aeadtest add_executable(aeadtest aeadtest.c) target_link_libraries(aeadtest ${OPENSSL_TEST_LIBS}) @@ -536,7 +539,7 @@ prepare_emscripten_test_target(lhash_test) add_platform_test(lhash_test lhash_test) # md_test -add_executable(md_test md_test.c) +add_executable(md_test md_test.c ${TEST_HELPER_SRC}) target_link_libraries(md_test ${OPENSSL_TEST_LIBS}) add_platform_test(md_test md_test) @@ -718,7 +721,7 @@ endif() set_tests_properties(servertest PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}") # sha_test -add_executable(sha_test sha_test.c) +add_executable(sha_test sha_test.c ${TEST_HELPER_SRC}) target_link_libraries(sha_test ${OPENSSL_TEST_LIBS}) add_platform_test(sha_test sha_test) diff --git a/tests/Makefile.am b/tests/Makefile.am index 350841f..31a1be2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -68,6 +68,10 @@ if HOST_X86_64 AM_CPPFLAGS += -I$(top_srcdir)/crypto/arch/amd64/ endif +# XXX - should probably be in their own static lib +TEST_HELPER_SRC = test.c test_util.c +noinst_HEADER = test.h + noinst_LTLIBRARIES = libtest.la libtest_la_LIBADD = $(libcrypto_la_objects) libtest_la_LIBADD += $(libcompat_la_objects) @@ -548,7 +552,7 @@ lhash_test_SOURCES = lhash_test.c # md_test TESTS += md_test check_PROGRAMS += md_test -md_test_SOURCES = md_test.c +md_test_SOURCES = md_test.c $(TEST_HELPER_SRC) noinst_HEADERS += mlkem_tests_util.h noinst_HEADERS += parse_test_file.h @@ -745,7 +749,7 @@ EXTRA_DIST += servertest.sh servertest.bat # sha_test TESTS += sha_test check_PROGRAMS += sha_test -sha_test_SOURCES = sha_test.c +sha_test_SOURCES = sha_test.c $(TEST_HELPER_SRC) # shutdowntest TESTS += shutdowntest.sh -- cgit v1.2.3-55-g6feb