commit 969c145f34dd448772c81044e43a007f2b3bc4aa
author David Horstmann <david.horstmann@arm.com> Tue Jan 31 10:34:44 2023 +0000
committer David Horstmann <david.horstmann@arm.com> Wed Jul 05 14:12:13 2023 +0100
tree b8080e8f6676b23f14e9ca742b6180c7e4679701
parent 20550e3d59b949a55eafa5b75e020c5d5d3ca7e9

Use CONFIG_H variable rather than config file name

Signed-off-by: David Horstmann <david.horstmann@arm.com>

tests/scripts/all.sh

diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index 3ed849d..1c40217 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -4567,20 +4567,20 @@
 }
 
 component_build_cmake_custom_config_file () {
-    # Make a copy of mbedtls_config.h to use for the in-tree test
-    cp include/mbedtls/mbedtls_config.h include/mbedtls_config_in_tree_copy.h
+    # Make a copy of config file to use for the in-tree test
+    cp "$CONFIG_H" include/mbedtls_config_in_tree_copy.h
 
     MBEDTLS_ROOT_DIR="$PWD"
     mkdir "$OUT_OF_SOURCE_DIR"
     cd "$OUT_OF_SOURCE_DIR"
 
-    # Build once to get the generated files (which need an intact mbedtls_config.h)
+    # Build once to get the generated files (which need an intact config file)
     cmake "$MBEDTLS_ROOT_DIR"
     make
 
     msg "build: cmake with -DMBEDTLS_CONFIG_FILE"
     scripts/config.py -w full_config.h full
-    echo '#error "cmake -DMBEDTLS_CONFIG_FILE is not working."' > "$MBEDTLS_ROOT_DIR/include/mbedtls/mbedtls_config.h"
+    echo '#error "cmake -DMBEDTLS_CONFIG_FILE is not working."' > "$MBEDTLS_ROOT_DIR/$CONFIG_H"
     cmake -DGEN_FILES=OFF -DMBEDTLS_CONFIG_FILE=full_config.h "$MBEDTLS_ROOT_DIR"
     make
 
@@ -4600,16 +4600,16 @@
 
     # Now repeat the test for an in-tree build:
 
-    # Restore mbedtls_config.h for the in-tree test
-    mv include/mbedtls_config_in_tree_copy.h include/mbedtls/mbedtls_config.h
+    # Restore config for the in-tree test
+    mv include/mbedtls_config_in_tree_copy.h "$CONFIG_H"
 
-    # Build once to get the generated files (which need an intact mbedtls_config.h)
+    # Build once to get the generated files (which need an intact config)
     cmake .
     make
 
     msg "build: cmake (in-tree) with -DMBEDTLS_CONFIG_FILE"
     scripts/config.py -w full_config.h full
-    echo '#error "cmake -DMBEDTLS_CONFIG_FILE is not working."' > "$MBEDTLS_ROOT_DIR/include/mbedtls/mbedtls_config.h"
+    echo '#error "cmake -DMBEDTLS_CONFIG_FILE is not working."' > "$MBEDTLS_ROOT_DIR/$CONFIG_H"
     cmake -DGEN_FILES=OFF -DMBEDTLS_CONFIG_FILE=full_config.h .
     make