Merge pull request #9419 from ronald-cron-arm/move-crypto-test-suites-3.6
[Backport 3.6] PR 9394 backport of fixes and framework submodule update
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d5135f5..10f4f53 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,6 +22,10 @@
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.
diff --git a/framework b/framework
index 9eeacb7..e8b4ae9 160000
--- a/framework
+++ b/framework
@@ -1 +1 @@
-Subproject commit 9eeacb7125d6630a11e29d8a7aab5873b3638b6d
+Subproject commit e8b4ae9bc4bf7e643ee46bf8ff4ef613be2de86f
diff --git a/programs/fuzz/Makefile b/programs/fuzz/Makefile
index 828e518..71cba0b 100644
--- a/programs/fuzz/Makefile
+++ b/programs/fuzz/Makefile
@@ -9,9 +9,7 @@
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).
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 041508c..b909c4e 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -69,7 +69,8 @@
# 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 @@
# 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 @@
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 @@
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)
diff --git a/tests/include/test/psa_test_wrappers.h b/tests/include/test/psa_test_wrappers.h
index e6d712b..9551855 100644
--- a/tests/include/test/psa_test_wrappers.h
+++ b/tests/include/test/psa_test_wrappers.h
@@ -17,7 +17,6 @@
!defined(RECORD_PSA_STATUS_COVERAGE_LOG)
#include <psa/crypto.h>
-
#include <test/memory.h>
#include <test/psa_crypto_helpers.h>
#include <test/psa_test_wrappers.h>
diff --git a/tests/src/psa_test_wrappers.c b/tests/src/psa_test_wrappers.c
index 24e05c8..7415e29 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 <psa/crypto.h>
-
#include <test/memory.h>
#include <test/psa_crypto_helpers.h>
#include <test/psa_test_wrappers.h>