From 977766c59fd867418c468495eae9f438768e9424 Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Thu, 11 Jul 2024 08:47:53 +0200 Subject: [PATCH 1/6] CMake: Include CMakePrintHelpers Signed-off-by: Ronald Cron --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index d5135f564..10f4f5380 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,6 +22,10 @@ cmake_minimum_required(VERSION 3.5.1) include(CMakePackageConfigHelpers) +# Include convenience functions for printing properties and variables, like +# cmake_print_properties(), cmake_print_variables(). +include(CMakePrintHelpers) + # https://cmake.org/cmake/help/latest/policy/CMP0011.html # Setting this policy is required in CMake >= 3.18.0, otherwise a warning is generated. The OLD # policy setting is deprecated, and will be removed in future versions. From c025f31399f756ce7c6724d36f6fc77be5b9169f Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Tue, 9 Jul 2024 14:20:34 +0200 Subject: [PATCH 2/6] tests: CMake: Align/fix config test suite generation Signed-off-by: Ronald Cron --- tests/CMakeLists.txt | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 041508cfb..b909c4ee1 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -69,7 +69,8 @@ string(REGEX REPLACE "[^;]*/" "" # Derive generated file paths in the build directory. The generated data # files go into the suites/ subdirectory. set(base_generated_data_files - ${base_bignum_generated_data_files} ${base_ecp_generated_data_files} ${base_psa_generated_data_files}) + ${base_bignum_generated_data_files} ${base_config_generated_data_files} + ${base_ecp_generated_data_files} ${base_psa_generated_data_files}) string(REGEX REPLACE "([^;]+)" "suites/\\1" all_generated_data_files "${base_generated_data_files}") set(bignum_generated_data_files "") @@ -197,6 +198,7 @@ function(add_test_suite suite_name) # Get the test names of the tests with generated .data files # from the generated_data_files list in parent scope. set(bignum_generated_data_names "") + set(config_generated_data_names "") set(ecp_generated_data_names "") set(psa_generated_data_names "") foreach(generated_data_file ${bignum_generated_data_files}) @@ -208,6 +210,15 @@ function(add_test_suite suite_name) string(SUBSTRING ${generated_data_name} 11 -1 generated_data_name) list(APPEND bignum_generated_data_names ${generated_data_name}) endforeach() + foreach(generated_data_file ${config_generated_data_files}) + # Get the plain filename + get_filename_component(generated_data_name ${generated_data_file} NAME) + # Remove the ".data" extension + get_name_without_last_ext(generated_data_name ${generated_data_name}) + # Remove leading "test_suite_" + string(SUBSTRING ${generated_data_name} 11 -1 generated_data_name) + list(APPEND config_generated_data_names ${generated_data_name}) + endforeach() foreach(generated_data_file ${ecp_generated_data_files}) # Get the plain filename get_filename_component(generated_data_name ${generated_data_file} NAME) @@ -234,7 +245,7 @@ function(add_test_suite suite_name) elseif(";${config_generated_data_names};" MATCHES ";${data_name};") set(data_file ${CMAKE_CURRENT_BINARY_DIR}/suites/test_suite_${data_name}.data) - set(dependency test_suite_bignum_generated_data) + set(dependency test_suite_config_generated_data) elseif(";${ecp_generated_data_names};" MATCHES ";${data_name};") set(data_file ${CMAKE_CURRENT_BINARY_DIR}/suites/test_suite_${data_name}.data) From 467775ef26fd5367835f4bde3b78c3488ff86e2d Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Fri, 12 Jul 2024 19:37:00 +0200 Subject: [PATCH 3/6] programs: fuzz: Fix comment Signed-off-by: Ronald Cron --- programs/fuzz/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/programs/fuzz/Makefile b/programs/fuzz/Makefile index 828e5184a..71cba0bcd 100644 --- a/programs/fuzz/Makefile +++ b/programs/fuzz/Makefile @@ -9,9 +9,7 @@ ifdef FUZZINGENGINE LOCAL_LDFLAGS += -lFuzzingEngine endif -# A test application is built for each suites/test_suite_*.data file. -# Application name is same as .data file's base name and can be -# constructed by stripping path 'suites/' and extension .data. +# A test application is built for each fuzz_*.c file. APPS = $(basename $(wildcard fuzz_*.c)) # Construct executable name by adding OS specific suffix $(EXEXT). From 62b0976c686b5512141be44d70322b0b86a288c8 Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Tue, 23 Jul 2024 07:53:12 +0200 Subject: [PATCH 4/6] Update framework as in PR 9394 Signed-off-by: Ronald Cron --- framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework b/framework index 9eeacb712..fc464209a 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 9eeacb7125d6630a11e29d8a7aab5873b3638b6d +Subproject commit fc464209a949557108fc6de1bbb49e3bc1a4725e From e5bbb2f79fd860fc8f1e1fb2459f77cad7e9d957 Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Tue, 23 Jul 2024 17:04:40 +0200 Subject: [PATCH 5/6] Update the framework submodule to the merge of PR38 Signed-off-by: Ronald Cron --- framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework b/framework index fc464209a..e8b4ae9bc 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit fc464209a949557108fc6de1bbb49e3bc1a4725e +Subproject commit e8b4ae9bc4bf7e643ee46bf8ff4ef613be2de86f From 1640bd3154b2d20f26f0846c8116ccd518444ba2 Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Tue, 23 Jul 2024 18:16:57 +0200 Subject: [PATCH 6/6] Update auto-generated psa_test_wrappers. Signed-off-by: Ronald Cron --- tests/include/test/psa_test_wrappers.h | 1 - tests/src/psa_test_wrappers.c | 1 - 2 files changed, 2 deletions(-) diff --git a/tests/include/test/psa_test_wrappers.h b/tests/include/test/psa_test_wrappers.h index e6d712bd6..95518559c 100644 --- a/tests/include/test/psa_test_wrappers.h +++ b/tests/include/test/psa_test_wrappers.h @@ -17,7 +17,6 @@ extern "C" { !defined(RECORD_PSA_STATUS_COVERAGE_LOG) #include - #include #include #include diff --git a/tests/src/psa_test_wrappers.c b/tests/src/psa_test_wrappers.c index 24e05c8c6..7415e293b 100644 --- a/tests/src/psa_test_wrappers.c +++ b/tests/src/psa_test_wrappers.c @@ -10,7 +10,6 @@ !defined(RECORD_PSA_STATUS_COVERAGE_LOG) #include - #include #include #include