Add 2 cases to test multiconfig multlib nativesdk gcc 1. test_multiconfig_64bit_gcc_suport_32bit_multilib Build 64bit x86_64 buildtools-tarball with package nativesdk-multiconfig-multlib-toolchain-packager-x86. The recipe nativesdk-multiconfig-multlib-toolchain-packager trigger a x86 multiconfig build to generate 32bit x86 buildtools-tarball which contains minimal 32bit toolchains libraries and include files. The package nativesdk-multiconfig-multlib-toolchain-packager-x86 extract 32bit x86 buildtools-tarball and installed it to 64bit x86_64 nativesdk sysroot. Then use 64bit gcc to compile 32bit and 64bit hello world program
2. test_multiconfig_32bit_gcc_suport_64bit_multilib Build 32bit i686 buildtools-tarball with package nativesdk-multiconfig-multlib-toolchain-packager-x86_64. The recipe nativesdk-multiconfig-multlib-toolchain-packager trigger a x86_64 multiconfig build to generate 64bit x86_64 buildtools-tarball which contains minimal 64bit toolchains libraries and include files. The package nativesdk-multiconfig-multlib-toolchain-packager-x86_64 extract 64bit x86_64 buildtools-tarball and installed it to 64bit x86_64 nativesdk sysroot. Then use 32bit gcc to compile 32bit and 64bit hello world program ... 2025-01-20 22:08:15,003 - oe-selftest - INFO - ... ok 2025-01-20 22:08:15,004 - oe-selftest - INFO - test_multiconfig_32bit_gcc_suport_64bit_multilib (multiconfig.MultiConfig) 2025-01-20 22:17:13,046 - oe-selftest - INFO - ... ok 2025-01-20 22:17:13,047 - oe-selftest - INFO - test_multiconfig_64bit_gcc_suport_32bit_multilib (multiconfig.MultiConfig) ... [ YOCTO #15722 ] Signed-off-by: Hongxu Jia <[email protected]> --- meta/lib/oeqa/selftest/cases/multiconfig.py | 139 +++++++++++++++++++- 1 file changed, 138 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/multiconfig.py b/meta/lib/oeqa/selftest/cases/multiconfig.py index f509cbf607..5757612ee3 100644 --- a/meta/lib/oeqa/selftest/cases/multiconfig.py +++ b/meta/lib/oeqa/selftest/cases/multiconfig.py @@ -7,7 +7,7 @@ import os import textwrap from oeqa.selftest.case import OESelftestTestCase -from oeqa.utils.commands import bitbake +from oeqa.utils.commands import bitbake, runCmd, get_bb_vars class MultiConfig(OESelftestTestCase): @@ -85,3 +85,140 @@ BBMULTICONFIG = "muslmc" # Build a core-image-minimal, only dry run needed to check config is present bitbake('mc:muslmc:bash -n') + + def _run_multilib_nativesdk_gcc(self, environment_script_path, c_example_src): + def runCmdEnv(cmd): + cmd = '/bin/sh -c ". %s > /dev/null && %s"' % ( + environment_script_path, cmd) + self.logger.debug(cmd) + result = runCmd(cmd) + self.logger.debug(f"ret: {result.status}, output {result.output}") + return result + + runCmdEnv('which gcc') + self.logger.debug(f"c_example_src {c_example_src}") + result = runCmdEnv("gcc -m32 %s -o main-32 && ./main-32" % (c_example_src)) + self.assertEqual("Hello world!", result.output, "Compile 32 bit program failed") + result = runCmdEnv("gcc -m64 %s -o main-64 && ./main-64" % (c_example_src)) + self.assertEqual("Hello world!", result.output, "Compile 64 bit program failed") + + def test_multiconfig_64bit_gcc_suport_32bit_multilib(self): + """ + Build 64bit x86_64 buildtools-extended-tarball with package nativesdk-multiconfig-multlib-toolchain-packager-x86. + The recipe nativesdk-multiconfig-multlib-toolchain-packager trigger a x86 multiconfig + build to generate 32bit x86 buildtools-tarball which contains minimal 32bit toolchains + libraries and include files. The package nativesdk-multiconfig-multlib-toolchain-packager-x86 + extract 32bit x86 buildtools-tarball and installed it to 64bit x86_64 nativesdk sysroot. + Then use 64bit gcc to compile 32bit and 64bit hello world program + """ + + config = """ +BBMULTICONFIG = "x86 x86_64" +# Unify the same SDKPATHNATIVE for two multiconfig, otherwise +# nativesdk relocation will fail +SDKPATHNATIVE = "${SDKPATH}/sysroots/x86_64${SDK_VENDOR}-${SDK_OS}" +""" + self.write_config(config) + + x86config = """ +SDKMACHINE = "i686" +TMPDIR = "${TOPDIR}/tmp-mc-x86" +# Only install 32bit toolchains library and include files to buildtools-tarball +TOOLCHAIN_HOST_TASK:pn-buildtools-tarball = "nativesdk-libgcc nativesdk-libgcc-dev nativesdk-glibc nativesdk-glibc-dev nativesdk-sdk-provides-dummy nativesdk-buildtools-perl-dummy" +# Do not add relocate script to buildtools-tarball +SDK_RELOCATE_AFTER_INSTALL:pn-buildtools-tarball = "0" +""" + self.write_config(x86config, 'x86') + + x86_64config = """ +SDKMACHINE = "x86_64" +TMPDIR = "${TOPDIR}/tmp-mc-x86_64" +TOOLCHAIN_HOST_TASK:append:pn-buildtools-extended-tarball = " nativesdk-multiconfig-multlib-toolchain-packager-x86" +# lib64 in 64bit nativesdk sysroot, avoid conflict with 32bit lib +baselib:class-nativesdk= "lib64" +baselib:class-crosssdk= "lib64" +libdir_nativesdk = "${prefix_nativesdk}/lib64" +base_libdir_nativesdk = "/lib64" +""" + self.write_config(x86_64config, 'x86_64') + + bitbake('mc:x86_64:buildtools-extended-tarball') + + needed_vars = ['TOPDIR', 'DISTRO_VERSION', 'COREBASE', 'SDK_VENDOR'] + bb_vars = get_bb_vars(needed_vars) + + c_example_src = os.path.join( + bb_vars['COREBASE'], + 'meta-skeleton/recipes-skeleton/hello-single/files/helloworld.c' + ) + sdk_name = 'x86_64-buildtools-extended-nativesdk-standalone-%s.sh' % bb_vars['DISTRO_VERSION'] + sdk_path = os.path.join(bb_vars['TOPDIR'], 'tmp-mc-x86_64/deploy/sdk', sdk_name) + self.logger.debug(f"sdk_path {sdk_path}") + runCmd('sh %s -y -d "%s"' % (sdk_path, './sdk-test')) + + environment_script = 'environment-setup-x86_64%s-linux' % (bb_vars['SDK_VENDOR']) + environment_script_path = os.path.join('./sdk-test', environment_script) + + self._run_multilib_nativesdk_gcc(environment_script_path, c_example_src) + + def test_multiconfig_32bit_gcc_suport_64bit_multilib(self): + """ + Build 32bit i686 buildtools-extended-tarball with package nativesdk-multiconfig-multlib-toolchain-packager-x86_64. + The recipe nativesdk-multiconfig-multlib-toolchain-packager trigger a x86_64 multiconfig + build to generate 64bit x86_64 buildtools-tarball which contains minimal 64bit toolchains + libraries and include files. The package nativesdk-multiconfig-multlib-toolchain-packager-x86_64 + extract 64bit x86_64 buildtools-tarball and installed it to 64bit x86_64 nativesdk sysroot. + Then use 64bit gcc to compile 32bit and 64bit hello world program + """ + + config = """ +BBMULTICONFIG = "x86 x86_64" +# Unify the same SDKPATHNATIVE for two multiconfig, otherwise +# nativesdk relocation will fail +SDKPATHNATIVE = "${SDKPATH}/sysroots/i686${SDK_VENDOR}-${SDK_OS}" +""" + self.write_config(config) + + x86config = """ +SDKMACHINE = "i686" +TMPDIR = "${TOPDIR}/tmp-mc-x86" +TOOLCHAIN_HOST_TASK:append:pn-buildtools-extended-tarball = " nativesdk-multiconfig-multlib-toolchain-packager-x86_64" +""" + self.write_config(x86config, 'x86') + + x86_64config = """ +SDKMACHINE = "x86_64" +TMPDIR = "${TOPDIR}/tmp-mc-x86_64" +# Only install 64bit toolchains library and include files to buildtools-tarball +TOOLCHAIN_HOST_TASK:pn-buildtools-tarball = "nativesdk-libgcc nativesdk-libgcc-dev nativesdk-glibc nativesdk-glibc-dev nativesdk-sdk-provides-dummy nativesdk-buildtools-perl-dummy" +# Do not add relocate script to buildtools-tarball +SDK_RELOCATE_AFTER_INSTALL:pn-buildtools-tarball = "0" + +# lib64 in 64bit nativesdk sysroot, avoid conflict with 32bit lib +baselib:class-nativesdk= "lib64" +baselib:class-crosssdk= "lib64" +libdir_nativesdk = "${prefix_nativesdk}/lib64" +base_libdir_nativesdk = "/lib64" +""" + self.write_config(x86_64config, 'x86_64') + + bitbake('mc:x86:buildtools-extended-tarball') + + needed_vars = ['TOPDIR', 'DISTRO_VERSION', 'COREBASE', 'SDK_VENDOR'] + bb_vars = get_bb_vars(needed_vars) + + c_example_src = os.path.join( + bb_vars['COREBASE'], + 'meta-skeleton/recipes-skeleton/hello-single/files/helloworld.c' + ) + sdk_name = 'i686-buildtools-extended-nativesdk-standalone-%s.sh' % bb_vars['DISTRO_VERSION'] + + sdk_path = os.path.join(bb_vars['TOPDIR'], 'tmp-mc-x86/deploy/sdk', sdk_name) + self.logger.debug(f"sdk_path {sdk_path}") + runCmd('sh %s -y -d "%s"' % (sdk_path, './sdk-test')) + + environment_script = 'environment-setup-i686%s-linux' % (bb_vars['SDK_VENDOR']) + environment_script_path = os.path.join('./sdk-test', environment_script) + + self._run_multilib_nativesdk_gcc(environment_script_path, c_example_src) + -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#210081): https://lists.openembedded.org/g/openembedded-core/message/210081 Mute This Topic: https://lists.openembedded.org/mt/110730427/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
