diff --git a/support/testing/conf/busybox-for-old-toolchains.cfg b/support/testing/conf/busybox-for-old-toolchains.cfg new file mode 100644 index 0000000000..63fa64f51a --- /dev/null +++ b/support/testing/conf/busybox-for-old-toolchains.cfg @@ -0,0 +1 @@ +# CONFIG_USE_BB_CRYPT_YES is not set diff --git a/support/testing/tests/toolchain/test_external.py b/support/testing/tests/toolchain/test_external.py index aed3664a02..b3bb961aac 100644 --- a/support/testing/tests/toolchain/test_external.py +++ b/support/testing/tests/toolchain/test_external.py @@ -70,8 +70,10 @@ class TestExternalToolchainArmGnu(TestExternalToolchain): class TestExternalToolchainBuildrootMusl(TestExternalToolchain): + busybox_fragment = \ + infra.filepath("conf/busybox-for-old-toolchains.cfg") config = BASIC_CONFIG + \ - """ + f""" BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_VFP=y @@ -83,6 +85,7 @@ class TestExternalToolchainBuildrootMusl(TestExternalToolchain): BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_12=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y BR2_TOOLCHAIN_EXTERNAL_CXX=y + BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="{busybox_fragment}" """ toolchain_prefix = "arm-linux" @@ -96,8 +99,10 @@ class TestExternalToolchainBuildrootMusl(TestExternalToolchain): class TestExternalToolchainCtngMusl(TestExternalToolchain): + busybox_fragment = \ + infra.filepath("conf/busybox-for-old-toolchains.cfg") config = BASIC_CONFIG + \ - """ + f""" BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_VFP=y @@ -110,6 +115,7 @@ class TestExternalToolchainCtngMusl(TestExternalToolchain): BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_10=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y BR2_TOOLCHAIN_EXTERNAL_CXX=y + BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="{busybox_fragment}" """ toolchain_prefix = "arm-ctng-linux-musleabihf" @@ -123,8 +129,10 @@ class TestExternalToolchainCtngMusl(TestExternalToolchain): class TestExternalToolchainBuildrootuClibc(TestExternalToolchain): + busybox_fragment = \ + infra.filepath("conf/busybox-for-old-toolchains.cfg") config = BASIC_CONFIG + \ - """ + f""" BR2_arm=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y @@ -135,6 +143,7 @@ class TestExternalToolchainBuildrootuClibc(TestExternalToolchain): BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set BR2_TOOLCHAIN_EXTERNAL_CXX=y + BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="{busybox_fragment}" """ toolchain_prefix = "arm-linux"