From 8b4b15269a60bec1c7fb1a5fb0497eec643b9ad2 Mon Sep 17 00:00:00 2001 From: Harry Ramsey Date: Tue, 15 Oct 2024 12:04:26 +0100 Subject: [PATCH] Fix test scripts for split error files This commit fixes failing tests to do with generated files and code styles. Signed-off-by: Harry Ramsey --- tests/scripts/check-generated-files.sh | 2 +- tf-psa-crypto/drivers/builtin/include/mbedtls/error_common.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/scripts/check-generated-files.sh b/tests/scripts/check-generated-files.sh index 583c26e8de..a224e58cad 100755 --- a/tests/scripts/check-generated-files.sh +++ b/tests/scripts/check-generated-files.sh @@ -170,7 +170,7 @@ check scripts/generate_driver_wrappers.py ${crypto_core_dir}/psa_crypto_driver_w # Additional checks for Mbed TLS only if in_mbedtls_repo; then - check scripts/generate_errors.pl ${builtin_drivers_dir}/error.c + check scripts/generate_errors.pl library/error.c check scripts/generate_query_config.pl programs/test/query_config.c check scripts/generate_features.pl library/version_features.c check framework/scripts/generate_ssl_debug_helpers.py library/ssl_debug_helpers_generated.c diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/error_common.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/error_common.h index 4598a93f5a..dc5e387cc2 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/error_common.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/error_common.h @@ -7,8 +7,8 @@ * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#ifndef MBEDTLS_ERRORCOMMON_COMMON_H -#define MBEDTLS_ERRORCOMMON_COMMON_H +#ifndef MBEDTLS_ERRORCOMMON_H +#define MBEDTLS_ERRORCOMMON_H #include "mbedtls/build_info.h"