From 3ecff27df15c2c22f7b9d8f7554119bc0346ff5b Mon Sep 17 00:00:00 2001 From: Niklas Cassel Date: Tue, 7 Mar 2023 10:35:04 +0100 Subject: [PATCH] support/testing: move the kernel config only used by test_edk2.py The kernel config board/qemu/aarch64-sbsa/linux.config has never been in use by qemu_aarch64_sbsa_defconfig, neither via BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE, nor via BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES. test_edk2.py is using the kernel config board/qemu/aarch64-sbsa/linux.config. However, storing a kernel config that is not used by qemu_aarch64_sbsa_defconfig, in a directory that is "owned" by qemu_aarch64_sbsa_defconfig, is bound to cause confusion. Therefore, move the config file to a new subdirectory: support/testing/tests/boot/test_edk2/ This is similar to how e.g. test_grub.py has a subdirectory: support/testing/tests/boot/test_grub/ where it keeps the kernel config that is only used by test_grub.py. Signed-off-by: Niklas Cassel Signed-off-by: Thomas Petazzoni --- support/testing/tests/boot/test_edk2.py | 2 +- .../testing/tests/boot/test_edk2}/linux.config | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename {board/qemu/aarch64-sbsa => support/testing/tests/boot/test_edk2}/linux.config (100%) diff --git a/support/testing/tests/boot/test_edk2.py b/support/testing/tests/boot/test_edk2.py index c1be8fad95..623e77e992 100644 --- a/support/testing/tests/boot/test_edk2.py +++ b/support/testing/tests/boot/test_edk2.py @@ -18,7 +18,7 @@ class TestEdk2(infra.basetest.BRTest): BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.34" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y - BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-sbsa/linux.config" + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="support/testing/tests/boot/test_edk2/linux.config" BR2_TARGET_EDK2=y BR2_TARGET_EDK2_PLATFORM_QEMU_SBSA=y BR2_TARGET_GRUB2=y diff --git a/board/qemu/aarch64-sbsa/linux.config b/support/testing/tests/boot/test_edk2/linux.config similarity index 100% rename from board/qemu/aarch64-sbsa/linux.config rename to support/testing/tests/boot/test_edk2/linux.config