From 4e0552995fa2a9864157a7b2a62462363e8c10bd Mon Sep 17 00:00:00 2001 From: Theo Buehler Date: Thu, 26 Dec 2024 00:28:23 -0700 Subject: Adjust the ML-KEM tests to recent reorganization --- tests/CMakeLists.txt | 86 ++++++----------------------------- tests/Makefile.am | 88 ++++++------------------------------ tests/mlkem1024_decap_tests.sh | 12 ----- tests/mlkem1024_encap_tests.sh | 12 ----- tests/mlkem1024_keygen_tests.sh | 12 ----- tests/mlkem1024_nist_decap_tests.sh | 12 ----- tests/mlkem1024_nist_keygen_tests.sh | 12 ----- tests/mlkem768_decap_tests.sh | 12 ----- tests/mlkem768_encap_tests.sh | 12 ----- tests/mlkem768_keygen_tests.sh | 12 ----- tests/mlkem768_nist_decap_tests.sh | 12 ----- tests/mlkem768_nist_keygen_tests.sh | 12 ----- tests/mlkem_tests.sh | 22 +++++++++ 13 files changed, 52 insertions(+), 264 deletions(-) delete mode 100755 tests/mlkem1024_decap_tests.sh delete mode 100755 tests/mlkem1024_encap_tests.sh delete mode 100755 tests/mlkem1024_keygen_tests.sh delete mode 100755 tests/mlkem1024_nist_decap_tests.sh delete mode 100755 tests/mlkem1024_nist_keygen_tests.sh delete mode 100755 tests/mlkem768_decap_tests.sh delete mode 100755 tests/mlkem768_encap_tests.sh delete mode 100755 tests/mlkem768_keygen_tests.sh delete mode 100755 tests/mlkem768_nist_decap_tests.sh delete mode 100755 tests/mlkem768_nist_keygen_tests.sh create mode 100755 tests/mlkem_tests.sh (limited to 'tests') diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 2639ee6..ba8444e 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -537,77 +537,21 @@ add_executable(md_test md_test.c) target_link_libraries(md_test ${OPENSSL_TEST_LIBS}) add_platform_test(md_test md_test) -# mlkem1024_decap_tests -add_executable(mlkem1024_decap_tests mlkem1024_decap_tests.c mlkem_tests_util.c) -target_link_libraries(mlkem1024_decap_tests ${OPENSSL_TEST_LIBS}) -prepare_emscripten_test_target(mlkem1024_decap_tests) -add_platform_test(mlkem1024_decap_tests mlkem1024_decap_tests ${CMAKE_CURRENT_SOURCE_DIR}/mlkem1024_decap_tests.txt) - -# mlkem1024_encap_tests -add_executable(mlkem1024_encap_tests mlkem1024_encap_tests.c mlkem_tests_util.c) -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}) -prepare_emscripten_test_target(mlkem1024_keygen_tests) -add_platform_test(mlkem1024_keygen_tests mlkem1024_keygen_tests ${CMAKE_CURRENT_SOURCE_DIR}/mlkem1024_keygen_tests.txt) - -# mlkem1024_nist_decap_tests -add_executable(mlkem1024_nist_decap_tests mlkem1024_nist_decap_tests.c mlkem_tests_util.c) -target_link_libraries(mlkem1024_nist_decap_tests ${OPENSSL_TEST_LIBS}) -prepare_emscripten_test_target(mlkem1024_nist_decap_tests) -add_platform_test(mlkem1024_nist_decap_tests mlkem1024_nist_decap_tests ${CMAKE_CURRENT_SOURCE_DIR}/mlkem1024_nist_decap_tests.txt) - -# mlkem1024_nist_keygen_tests -add_executable(mlkem1024_nist_keygen_tests mlkem1024_nist_keygen_tests.c mlkem_tests_util.c) -target_link_libraries(mlkem1024_nist_keygen_tests ${OPENSSL_TEST_LIBS}) -prepare_emscripten_test_target(mlkem1024_nist_keygen_tests) -add_platform_test(mlkem1024_nist_keygen_tests mlkem1024_nist_keygen_tests ${CMAKE_CURRENT_SOURCE_DIR}/mlkem1024_nist_keygen_tests.txt) - -# mlkem768_decap_tests -add_executable(mlkem768_decap_tests mlkem768_decap_tests.c mlkem_tests_util.c) -target_link_libraries(mlkem768_decap_tests ${OPENSSL_TEST_LIBS}) -prepare_emscripten_test_target(mlkem768_decap_tests) -add_platform_test(mlkem768_decap_tests mlkem768_decap_tests ${CMAKE_CURRENT_SOURCE_DIR}/mlkem768_decap_tests.txt) - -# mlkem768_encap_tests -add_executable(mlkem768_encap_tests mlkem768_encap_tests.c mlkem_tests_util.c) -target_link_libraries(mlkem768_encap_tests ${OPENSSL_TEST_LIBS}) -prepare_emscripten_test_target(mlkem768_encap_tests) -add_platform_test(mlkem768_encap_tests mlkem768_encap_tests ${CMAKE_CURRENT_SOURCE_DIR}/mlkem768_encap_tests.txt) - -# mlkem768_iteration_test -add_executable(mlkem768_iteration_test mlkem768_iteration_test.c mlkem_tests_util.c) -target_link_libraries(mlkem768_iteration_test ${OPENSSL_TEST_LIBS}) -prepare_emscripten_test_target(mlkem768_iteration_test) -add_platform_test(mlkem768_iteration_test mlkem768_iteration_test) - -# mlkem768_keygen_tests -add_executable(mlkem768_keygen_tests mlkem768_keygen_tests.c mlkem_tests_util.c) -target_link_libraries(mlkem768_keygen_tests ${OPENSSL_TEST_LIBS}) -prepare_emscripten_test_target(mlkem768_keygen_tests) -add_platform_test(mlkem768_keygen_tests mlkem768_keygen_tests ${CMAKE_CURRENT_SOURCE_DIR}/mlkem768_keygen_tests.txt) - -# mlkem768_nist_decap_tests -add_executable(mlkem768_nist_decap_tests mlkem768_nist_decap_tests.c mlkem_tests_util.c) -target_link_libraries(mlkem768_nist_decap_tests ${OPENSSL_TEST_LIBS}) -prepare_emscripten_test_target(mlkem768_nist_decap_tests) -add_platform_test(mlkem768_nist_decap_tests mlkem768_nist_decap_tests ${CMAKE_CURRENT_SOURCE_DIR}/mlkem768_nist_decap_tests.txt) - -# mlkem768_nist_keygen_tests -add_executable(mlkem768_nist_keygen_tests mlkem768_nist_keygen_tests.c mlkem_tests_util.c) -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_tests +add_executable(mlkem_tests mlkem_tests.c mlkem_tests_util.c parse_test_file.c) +target_link_libraries(mlkem_tests ${OPENSSL_TEST_LIBS}) +prepare_emscripten_test_target(mlkem_tests) +if(NOT WIN32) + add_test(NAME mlkem_tests COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/mlkem_tests.sh) + set_tests_properties(mlkem_tests PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}") +endif() +# XXX - add tests for Windows + +# mlkem_iteration_tests +add_executable(mlkem_iteration_tests mlkem_iteration_tests.c mlkem_tests_util.c) +target_link_libraries(mlkem_iteration_tests ${OPENSSL_TEST_LIBS}) +prepare_emscripten_test_target(mlkem_iteration_tests) +add_platform_test(mlkem_iteration_tests mlkem_iteration_tests) # mlkem_unittest add_executable(mlkem_unittest mlkem_unittest.c mlkem_tests_util.c) diff --git a/tests/Makefile.am b/tests/Makefile.am index e5d3bec..55f0b70 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -546,86 +546,28 @@ check_PROGRAMS += md_test md_test_SOURCES = md_test.c noinst_HEADERS += mlkem_tests_util.h +noinst_HEADERS += parse_test_file.h -# mlkem1024_decap_tests -TESTS += mlkem1024_decap_tests.sh -check_PROGRAMS += mlkem1024_decap_tests -mlkem1024_decap_tests_SOURCES = mlkem1024_decap_tests.c mlkem_tests_util.c -EXTRA_DIST += mlkem1024_decap_tests.sh +# mlkem_tests +TESTS += mlkem_tests.sh +check_PROGRAMS += mlkem_tests +mlkem_tests_SOURCES = mlkem_tests.c mlkem_tests_util.c parse_test_file.c +EXTRA_DIST += mlkem_tests.sh +EXTRA_DIST += mlkem768_decap_tests.txt +EXTRA_DIST += mlkem768_encap_tests.txt +EXTRA_DIST += mlkem768_keygen_tests.txt +EXTRA_DIST += mlkem768_nist_decap_tests.txt +EXTRA_DIST += mlkem768_nist_keygen_tests.txt EXTRA_DIST += mlkem1024_decap_tests.txt - -# mlkem1024_encap_tests -TESTS += mlkem1024_encap_tests.sh -check_PROGRAMS += mlkem1024_encap_tests -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 -mlkem1024_keygen_tests_SOURCES = mlkem1024_keygen_tests.c mlkem_tests_util.c -EXTRA_DIST += mlkem1024_keygen_tests.sh EXTRA_DIST += mlkem1024_keygen_tests.txt - -# mlkem1024_nist_decap_tests -TESTS += mlkem1024_nist_decap_tests.sh -check_PROGRAMS += mlkem1024_nist_decap_tests -mlkem1024_nist_decap_tests_SOURCES = mlkem1024_nist_decap_tests.c mlkem_tests_util.c -EXTRA_DIST += mlkem1024_nist_decap_tests.sh EXTRA_DIST += mlkem1024_nist_decap_tests.txt - -# mlkem1024_nist_keygen_tests -TESTS += mlkem1024_nist_keygen_tests.sh -check_PROGRAMS += mlkem1024_nist_keygen_tests -mlkem1024_nist_keygen_tests_SOURCES = mlkem1024_nist_keygen_tests.c mlkem_tests_util.c -EXTRA_DIST += mlkem1024_nist_keygen_tests.sh EXTRA_DIST += mlkem1024_nist_keygen_tests.txt -# mlkem768_decap_tests -TESTS += mlkem768_decap_tests.sh -check_PROGRAMS += mlkem768_decap_tests -mlkem768_decap_tests_SOURCES = mlkem768_decap_tests.c mlkem_tests_util.c -EXTRA_DIST += mlkem768_decap_tests.sh -EXTRA_DIST += mlkem768_decap_tests.txt - -# mlkem768_encap_tests -TESTS += mlkem768_encap_tests.sh -check_PROGRAMS += mlkem768_encap_tests -mlkem768_encap_tests_SOURCES = mlkem768_encap_tests.c mlkem_tests_util.c -EXTRA_DIST += mlkem768_encap_tests.sh -EXTRA_DIST += mlkem768_encap_tests.txt - -# mlkem768_iteration_test -TESTS += mlkem768_iteration_test -check_PROGRAMS += mlkem768_iteration_test -mlkem768_iteration_test_SOURCES = mlkem768_iteration_test.c mlkem_tests_util.c - -# mlkem768_keygen_tests -TESTS += mlkem768_keygen_tests.sh -check_PROGRAMS += mlkem768_keygen_tests -mlkem768_keygen_tests_SOURCES = mlkem768_keygen_tests.c mlkem_tests_util.c -EXTRA_DIST += mlkem768_keygen_tests.sh -EXTRA_DIST += mlkem768_keygen_tests.txt - -# mlkem768_nist_decap_tests -TESTS += mlkem768_nist_decap_tests.sh -check_PROGRAMS += mlkem768_nist_decap_tests -mlkem768_nist_decap_tests_SOURCES = mlkem768_nist_decap_tests.c mlkem_tests_util.c -EXTRA_DIST += mlkem768_nist_decap_tests.sh -EXTRA_DIST += mlkem768_nist_decap_tests.txt - -# mlkem768_nist_keygen_tests -TESTS += mlkem768_nist_keygen_tests.sh -check_PROGRAMS += mlkem768_nist_keygen_tests -mlkem768_nist_keygen_tests_SOURCES = mlkem768_nist_keygen_tests.c mlkem_tests_util.c -EXTRA_DIST += mlkem768_nist_keygen_tests.sh -EXTRA_DIST += mlkem768_nist_keygen_tests.txt +# mlkem_iteration_tests +TESTS += mlkem_iteration_tests +check_PROGRAMS += mlkem_iteration_tests +mlkem_iteration_tests_SOURCES = mlkem_iteration_tests.c mlkem_tests_util.c # mlkem_unittest TESTS += mlkem_unittest diff --git a/tests/mlkem1024_decap_tests.sh b/tests/mlkem1024_decap_tests.sh deleted file mode 100755 index 95efa48..0000000 --- a/tests/mlkem1024_decap_tests.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 diff --git a/tests/mlkem1024_encap_tests.sh b/tests/mlkem1024_encap_tests.sh deleted file mode 100755 index 9f4f2b1..0000000 --- a/tests/mlkem1024_encap_tests.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -set -e -TEST=./mlkem1024_encap_tests -if [ -e ./mlkem1024_encap_tests.exe ]; then - TEST=./mlkem1024_encap_tests.exe -fi - -if [ -z $srcdir ]; then - srcdir=. -fi - -$TEST $srcdir/mlkem1024_encap_tests.txt diff --git a/tests/mlkem1024_keygen_tests.sh b/tests/mlkem1024_keygen_tests.sh deleted file mode 100755 index 5287cf2..0000000 --- a/tests/mlkem1024_keygen_tests.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -set -e -TEST=./mlkem1024_keygen_tests -if [ -e ./mlkem1024_keygen_tests.exe ]; then - TEST=./mlkem1024_keygen_tests.exe -fi - -if [ -z $srcdir ]; then - srcdir=. -fi - -$TEST $srcdir/mlkem1024_keygen_tests.txt diff --git a/tests/mlkem1024_nist_decap_tests.sh b/tests/mlkem1024_nist_decap_tests.sh deleted file mode 100755 index 58bfc4e..0000000 --- a/tests/mlkem1024_nist_decap_tests.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -set -e -TEST=./mlkem1024_nist_decap_tests -if [ -e ./mlkem1024_nist_decap_tests.exe ]; then - TEST=./mlkem1024_nist_decap_tests.exe -fi - -if [ -z $srcdir ]; then - srcdir=. -fi - -$TEST $srcdir/mlkem1024_nist_decap_tests.txt diff --git a/tests/mlkem1024_nist_keygen_tests.sh b/tests/mlkem1024_nist_keygen_tests.sh deleted file mode 100755 index 643109c..0000000 --- a/tests/mlkem1024_nist_keygen_tests.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -set -e -TEST=./mlkem1024_nist_keygen_tests -if [ -e ./mlkem1024_nist_keygen_tests.exe ]; then - TEST=./mlkem1024_nist_keygen_tests.exe -fi - -if [ -z $srcdir ]; then - srcdir=. -fi - -$TEST $srcdir/mlkem1024_nist_keygen_tests.txt diff --git a/tests/mlkem768_decap_tests.sh b/tests/mlkem768_decap_tests.sh deleted file mode 100755 index af11da3..0000000 --- a/tests/mlkem768_decap_tests.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -set -e -TEST=./mlkem768_decap_tests -if [ -e ./mlkem768_decap_tests.exe ]; then - TEST=./mlkem768_decap_tests.exe -fi - -if [ -z $srcdir ]; then - srcdir=. -fi - -$TEST $srcdir/mlkem768_decap_tests.txt diff --git a/tests/mlkem768_encap_tests.sh b/tests/mlkem768_encap_tests.sh deleted file mode 100755 index ee5c979..0000000 --- a/tests/mlkem768_encap_tests.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -set -e -TEST=./mlkem768_encap_tests -if [ -e ./mlkem768_encap_tests.exe ]; then - TEST=./mlkem768_encap_tests.exe -fi - -if [ -z $srcdir ]; then - srcdir=. -fi - -$TEST $srcdir/mlkem768_encap_tests.txt diff --git a/tests/mlkem768_keygen_tests.sh b/tests/mlkem768_keygen_tests.sh deleted file mode 100755 index 0c84709..0000000 --- a/tests/mlkem768_keygen_tests.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -set -e -TEST=./mlkem768_keygen_tests -if [ -e ./mlkem768_keygen_tests.exe ]; then - TEST=./mlkem768_keygen_tests.exe -fi - -if [ -z $srcdir ]; then - srcdir=. -fi - -$TEST $srcdir/mlkem768_keygen_tests.txt diff --git a/tests/mlkem768_nist_decap_tests.sh b/tests/mlkem768_nist_decap_tests.sh deleted file mode 100755 index 42bdedc..0000000 --- a/tests/mlkem768_nist_decap_tests.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -set -e -TEST=./mlkem768_nist_decap_tests -if [ -e ./mlkem768_nist_decap_tests.exe ]; then - TEST=./mlkem768_nist_decap_tests.exe -fi - -if [ -z $srcdir ]; then - srcdir=. -fi - -$TEST $srcdir/mlkem768_nist_decap_tests.txt diff --git a/tests/mlkem768_nist_keygen_tests.sh b/tests/mlkem768_nist_keygen_tests.sh deleted file mode 100755 index 0c84709..0000000 --- a/tests/mlkem768_nist_keygen_tests.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -set -e -TEST=./mlkem768_keygen_tests -if [ -e ./mlkem768_keygen_tests.exe ]; then - TEST=./mlkem768_keygen_tests.exe -fi - -if [ -z $srcdir ]; then - srcdir=. -fi - -$TEST $srcdir/mlkem768_keygen_tests.txt diff --git a/tests/mlkem_tests.sh b/tests/mlkem_tests.sh new file mode 100755 index 0000000..aaad199 --- /dev/null +++ b/tests/mlkem_tests.sh @@ -0,0 +1,22 @@ +#!/bin/sh +set -e + +TEST=./mlkem_tests +if [ -e ./mlkem_tests.exe ]; then + TEST=./mlkem_tests.exe +fi + +if [ -z $srcdir ]; then + srcdir=. +fi + +$TEST mlkem768_decap_tests $srcdir/mlkem768_decap_tests.txt +$TEST mlkem768_encap_tests $srcdir/mlkem768_encap_tests.txt +$TEST mlkem768_keygen_tests $srcdir/mlkem768_keygen_tests.txt +$TEST mlkem768_nist_decap_tests $srcdir/mlkem768_nist_decap_tests.txt +$TEST mlkem768_nist_keygen_tests $srcdir/mlkem768_nist_keygen_tests.txt +$TEST mlkem1024_decap_tests $srcdir/mlkem1024_decap_tests.txt +$TEST mlkem1024_encap_tests $srcdir/mlkem1024_encap_tests.txt +$TEST mlkem1024_keygen_tests $srcdir/mlkem1024_keygen_tests.txt +$TEST mlkem1024_nist_decap_tests $srcdir/mlkem1024_nist_decap_tests.txt +$TEST mlkem1024_nist_keygen_tests $srcdir/mlkem1024_nist_keygen_tests.txt -- cgit v1.2.3-55-g6feb