Sort out inclusions of <test/build_info.h> vs "test_common.h"

Include `"test_common.h"` as the first thing in C files, and
`<test/build_info.h>` as the first thing in header files.

This requires moving `<test/test_common.h>` to its intended location
`"test_common.h"`.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine
2026-03-11 19:50:22 +01:00
parent 30d9a6210b
commit 25c1750beb
30 changed files with 33 additions and 17 deletions
+1 -1
View File
@@ -14,7 +14,7 @@
#ifndef TEST_ARGUMENTS_H
#define TEST_ARGUMENTS_H
#include "test_common.h"
#include "build_info.h"
#include <stdint.h>
#include <stdlib.h>
+1 -1
View File
@@ -8,7 +8,7 @@
#ifndef ASN1_HELPERS_H
#define ASN1_HELPERS_H
#include "test_common.h"
#include "build_info.h"
#include "test/helpers.h"
/** Skip past an INTEGER in an ASN.1 buffer.
+1 -1
View File
@@ -17,7 +17,7 @@
#ifndef BIGNUM_CODEPATH_CHECK_H
#define BIGNUM_CODEPATH_CHECK_H
#include "test_common.h"
#include "build_info.h"
#include "bignum_core.h"
+1 -1
View File
@@ -13,7 +13,7 @@
#ifndef TEST_BIGNUM_HELPERS_H
#define TEST_BIGNUM_HELPERS_H
#include "test_common.h"
#include "build_info.h"
#if defined(MBEDTLS_BIGNUM_C)
+1 -1
View File
@@ -12,7 +12,7 @@
#ifndef TEST_CONSTANT_FLOW_H
#define TEST_CONSTANT_FLOW_H
#include "test_common.h"
#include "build_info.h"
/*
* This file defines the two macros
@@ -10,7 +10,7 @@
#ifndef FAKE_EXTERNAL_RNG_FOR_TEST_H
#define FAKE_EXTERNAL_RNG_FOR_TEST_H
#include "test_common.h"
#include "build_info.h"
#if defined(MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG)
/** Enable the insecure implementation of mbedtls_psa_external_get_random().
+1 -1
View File
@@ -13,7 +13,7 @@
#ifndef TEST_HELPERS_H
#define TEST_HELPERS_H
#include "test_common.h"
#include "build_info.h"
#if defined(__SANITIZE_ADDRESS__) /* gcc -fsanitize=address */
# define MBEDTLS_TEST_HAVE_ASAN
+1 -1
View File
@@ -12,7 +12,7 @@
#ifndef TEST_MACROS_H
#define TEST_MACROS_H
#include "test_common.h"
#include "build_info.h"
#include <stdlib.h>
+1 -1
View File
@@ -12,7 +12,7 @@
#ifndef TEST_MEMORY_H
#define TEST_MEMORY_H
#include "test_common.h"
#include "build_info.h"
#include "mbedtls/platform.h"
#include "test/helpers.h"
+1 -1
View File
@@ -10,7 +10,7 @@
#ifndef PK_HELPERS_H
#define PK_HELPERS_H
#include "test_common.h"
#include "build_info.h"
#if defined(MBEDTLS_PK_C)
+1 -1
View File
@@ -9,7 +9,7 @@
#ifndef PSA_CRYPTO_HELPERS_H
#define PSA_CRYPTO_HELPERS_H
#include "test_common.h"
#include "build_info.h"
#include "test/helpers.h"
#if (MBEDTLS_VERSION_MAJOR < 4 && defined(MBEDTLS_PSA_CRYPTO_C)) || \
+1 -1
View File
@@ -9,7 +9,7 @@
#ifndef PSA_EXERCISE_KEY_H
#define PSA_EXERCISE_KEY_H
#include "test_common.h"
#include "build_info.h"
#include "test/helpers.h"
#include "test/psa_crypto_helpers.h"
+1 -1
View File
@@ -9,7 +9,7 @@
#ifndef PSA_HELPERS_H
#define PSA_HELPERS_H
#include "test_common.h"
#include "build_info.h"
#if defined(MBEDTLS_PSA_CRYPTO_SPM)
#include "spm/psa_defs.h"
@@ -15,7 +15,7 @@
#ifndef PSA_MEMORY_POISONING_WRAPPERS_H
#define PSA_MEMORY_POISONING_WRAPPERS_H
#include "test_common.h"
#include "build_info.h"
#include "psa/crypto.h"
+1 -1
View File
@@ -13,7 +13,7 @@
#ifndef TEST_RANDOM_H
#define TEST_RANDOM_H
#include "test_common.h"
#include "build_info.h"
#include <stddef.h>
#include <stdint.h>
+1 -1
View File
@@ -13,7 +13,7 @@
#ifndef THREADING_HELPERS_H
#define THREADING_HELPERS_H
#include "test_common.h"
#include "build_info.h"
#if defined MBEDTLS_THREADING_C
+1
View File
@@ -8,6 +8,7 @@
* SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
*/
#include "test_common.h"
#include <test/helpers.h>
#include <test/macros.h>
+1
View File
@@ -5,6 +5,7 @@
* SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
*/
#include "test_common.h"
#include "test/bignum_codepath_check.h"
#include "bignum_core_invasive.h"
+2 -1
View File
@@ -10,7 +10,8 @@
* SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
*/
#define MBEDTLS_ALLOW_PRIVATE_ACCESS
#include "test_common.h"
#include <test/bignum_helpers.h>
#if defined(MBEDTLS_BIGNUM_C)
+2
View File
@@ -13,6 +13,8 @@
* SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
*/
#include "test_common.h"
#include <test/fake_external_rng_for_test.h>
#if defined(MBEDTLS_PSA_DRIVER_GET_ENTROPY)
+2
View File
@@ -3,6 +3,8 @@
* SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
*/
#include "test_common.h"
#include <test/constant_flow.h>
#include <test/helpers.h>
#include <test/macros.h>
+1
View File
@@ -7,6 +7,7 @@
* SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
*/
#include "test_common.h"
#include <test/macros.h>
#include <test/helpers.h>
#include <test/pk_helpers.h>
+1
View File
@@ -8,6 +8,7 @@
* SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
*/
#include "test_common.h"
#include <test/helpers.h>
#include <test/macros.h>
#include <psa_crypto_slot_management.h>
+1
View File
@@ -9,6 +9,7 @@
* SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
*/
#include "test_common.h"
#include <psa/crypto.h>
#if defined(MBEDTLS_PSA_CRYPTO_CLIENT) && !defined(MBEDTLS_PSA_CRYPTO_C)
+1
View File
@@ -7,6 +7,7 @@
* SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
*/
#include "test_common.h"
#include <test/helpers.h>
#include <test/macros.h>
#include <test/psa_exercise_key.h>
@@ -4,6 +4,8 @@
* Copyright The Mbed TLS Contributors
* SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
*/
#include "test_common.h"
#include <test/memory.h>
#include <test/psa_memory_poisoning_wrappers.h>
+1
View File
@@ -19,6 +19,7 @@
#define _BSD_SOURCE 1
#endif
#include "test_common.h"
#include <test/macros.h>
#include <test/random.h>
#include <string.h>
+1
View File
@@ -9,6 +9,7 @@
* SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
*/
#include "test_common.h"
#include <test/helpers.h>
#include <test/macros.h>
#include <test/memory.h>
+1
View File
@@ -5,6 +5,7 @@
* SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
*/
#include "test_common.h"
#include <test/helpers.h>
#include <test/threading_helpers.h>
#include <test/macros.h>