From f46d437e5149fced7b0c71a4c40a1b2fbb78dc90 Mon Sep 17 00:00:00 2001 From: Theo Buehler Date: Tue, 17 Dec 2024 10:18:16 +0100 Subject: Some fixes for ML-KEM tests - Run the 1024 iteration test as well as unit tests. - Remove unused test script with unexpected contents. Follow-on to #1127 --- tests/CMakeLists.txt | 12 ++++++++++++ tests/Makefile.am | 10 ++++++++++ tests/mlkem1024_iteration_test.sh | 12 ------------ 3 files changed, 22 insertions(+), 12 deletions(-) delete mode 100755 tests/mlkem1024_iteration_test.sh diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index ba521ad..8b079f4 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -548,6 +548,12 @@ target_link_libraries(mlkem1024_encap_tests ${OPENSSL_TEST_LIBS}) prepare_emscripten_test_target(mlkem1024_encap_tests) add_platform_test(mlkem1024_encap_tests mlkem1024_encap_tests ${CMAKE_CURRENT_SOURCE_DIR}/mlkem1024_encap_tests.txt) +# mlkem1024_iteration_test +add_executable(mlkem1024_iteration_test mlkem1024_iteration_test.c mlkem_tests_util.c) +target_link_libraries(mlkem1024_iteration_test ${OPENSSL_TEST_LIBS}) +prepare_emscripten_test_target(mlkem1024_iteration_test) +add_platform_test(mlkem1024_iteration_test mlkem1024_iteration_test) + # mlkem1024_keygen_tests add_executable(mlkem1024_keygen_tests mlkem1024_keygen_tests.c mlkem_tests_util.c) target_link_libraries(mlkem1024_keygen_tests ${OPENSSL_TEST_LIBS}) @@ -602,6 +608,12 @@ target_link_libraries(mlkem768_nist_keygen_tests ${OPENSSL_TEST_LIBS}) prepare_emscripten_test_target(mlkem768_nist_keygen_tests) add_platform_test(mlkem768_nist_keygen_tests mlkem768_nist_keygen_tests ${CMAKE_CURRENT_SOURCE_DIR}/mlkem768_nist_keygen_tests.txt) +# mlkem_unittest +add_executable(mlkem_unittest mlkem_unittest.c mlkem_tests_util.c) +target_link_libraries(mlkem_unittest ${OPENSSL_TEST_LIBS}) +prepare_emscripten_test_target(mlkem_unittest) +add_platform_test(mlkem_unittest mlkem_unittest) + # objectstest add_executable(objectstest objectstest.c) target_link_libraries(objectstest ${OPENSSL_TEST_LIBS}) diff --git a/tests/Makefile.am b/tests/Makefile.am index 36cbb9a..6cb2d3f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -560,6 +560,11 @@ mlkem1024_encap_tests_SOURCES = mlkem1024_encap_tests.c mlkem_tests_util.c EXTRA_DIST += mlkem1024_encap_tests.sh EXTRA_DIST += mlkem1024_encap_tests.txt +# mlkem1024_iteration_test +TESTS += mlkem1024_iteration_test +check_PROGRAMS += mlkem1024_iteration_test +mlkem1024_iteration_test_SOURCES = mlkem1024_iteration_test.c mlkem_tests_util.c + # mlkem1024_keygen_tests TESTS += mlkem1024_keygen_tests.sh check_PROGRAMS += mlkem1024_keygen_tests @@ -621,6 +626,11 @@ mlkem768_nist_keygen_tests_SOURCES = mlkem768_nist_keygen_tests.c mlkem_tests_ut EXTRA_DIST += mlkem768_nist_keygen_tests.sh EXTRA_DIST += mlkem768_nist_keygen_tests.txt +# mlkem_unittest +TESTS += mlkem_unittest +check_PROGRAMS += mlkem_unittest +mlkem_unittest_SOURCES = mlkem_unittest.c mlkem_tests_util.c + # objectstest TESTS += objectstest check_PROGRAMS += objectstest diff --git a/tests/mlkem1024_iteration_test.sh b/tests/mlkem1024_iteration_test.sh deleted file mode 100755 index 95efa48..0000000 --- a/tests/mlkem1024_iteration_test.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -set -e -TEST=./mlkem1024_decap_tests -if [ -e ./mlkem1024_decap_tests.exe ]; then - TEST=./mlkem1024_decap_tests.exe -fi - -if [ -z $srcdir ]; then - srcdir=. -fi - -$TEST $srcdir/mlkem1024_decap_tests.txt -- cgit v1.2.3-55-g6feb