From patchwork Fri Aug 12 10:45:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 11321 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9D23BC00140 for ; Fri, 12 Aug 2022 10:45:25 +0000 (UTC) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mx.groups.io with SMTP id smtpd.web11.9218.1660301117834717925 for ; Fri, 12 Aug 2022 03:45:18 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=VgKbYV6+; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.48, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f48.google.com with SMTP id p12-20020a7bcc8c000000b003a5360f218fso4136872wma.3 for ; Fri, 12 Aug 2022 03:45:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc; bh=PUCUU+XvVeyMArOEr/8myWK/k6ICuowMb/yJ6vUYnhA=; b=VgKbYV6+P3u0j04/I3Wyg0ofrREKmRf1eXkf9v6TreCBzAk5gDR5wGYcvildXNl7Di rU3Q1ErtnBdVnL7yWL7QXYJ0LxPy9qdJ3dQPczLjkfN+c83gR1yZYR04+DSyztMSRkpz WplGNQiLBndTpCLc2HKbJPciNIdUXSeVQLUJI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc; bh=PUCUU+XvVeyMArOEr/8myWK/k6ICuowMb/yJ6vUYnhA=; b=P0VNmjtuNZkoaWzR5D7QJ4USEBsSilGuy/2tVybP+4AFZFHI2wLT42l6Psb4UMNsxW jcmCZiSZ2LhvPIhGqjpNvDfvg3ZhqRPZUZXMR6zN09k5CBy0bnEGfn30O+5+qeVPkEyB R81i0vzne93XPtM8i9CSzx0aXweSh15CnPMp9tpCnNZMcDv/mGZtAqbtl6Bmyc+4I6Vz +lB/KaKFahdtCSFgAuOd8iG+dveZIFUEru1DQ+RWgt/Mq4R0F4Qo1Ubzkji1yILvuhiC ao6Q5xJXLZ/RDy2juWT4BxL1qN+ih74omHdszysmGxKduEClH87rwYq1vF0IYLRwPJKX i6Jw== X-Gm-Message-State: ACgBeo14UJqhUKQqCHwP54f9NsXWKS86ZAPGXdPrXQvqbhAQCZKwCUpq DboqOneRbpSEyGt9cjDQtNmEzCZ80URTBw== X-Google-Smtp-Source: AA6agR7cLg/ki+A356mIeP8g7d3Msi0esHvf6WJ141sUJ36Rt5W5+gFN7vz6mv/A5T8MaE8e+hcnOw== X-Received: by 2002:a05:600c:1914:b0:3a3:4476:36f1 with SMTP id j20-20020a05600c191400b003a3447636f1mr8547569wmq.205.1660301115823; Fri, 12 Aug 2022 03:45:15 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:c425:95a5:4141:7147]) by smtp.gmail.com with ESMTPSA id s11-20020a5d69cb000000b00220628ef654sm1587732wrw.24.2022.08.12.03.45.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Aug 2022 03:45:15 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/4] selftest/runtime_test/incompatible_lic: Use IMAGE_CLASSES for testimage Date: Fri, 12 Aug 2022 11:45:11 +0100 Message-Id: <20220812104514.825820-1-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 12 Aug 2022 10:45:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169277 testimage should be included via IMAGE_CLASSES, not globally with INHERIT. Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/incompatible_lic.py | 2 +- meta/lib/oeqa/selftest/cases/runtime_test.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/incompatible_lic.py b/meta/lib/oeqa/selftest/cases/incompatible_lic.py index 6279d742459..35218491586 100644 --- a/meta/lib/oeqa/selftest/cases/incompatible_lic.py +++ b/meta/lib/oeqa/selftest/cases/incompatible_lic.py @@ -134,7 +134,7 @@ INCOMPATIBLE_LICENSE:pn-core-image-minimal = "GPL-3.0* LGPL-3.0*" def test_core_image_full_cmdline_weston(self): self.write_config(""" -INHERIT += "testimage" +IMAGE_CLASSES += "testimage" INCOMPATIBLE_LICENSE:pn-core-image-full-cmdline = "GPL-3.0* LGPL-3.0*" INCOMPATIBLE_LICENSE:pn-core-image-weston = "GPL-3.0* LGPL-3.0*" # Settings for full-cmdline diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py b/meta/lib/oeqa/selftest/cases/runtime_test.py index 857737f730c..70fff6c6541 100644 --- a/meta/lib/oeqa/selftest/cases/runtime_test.py +++ b/meta/lib/oeqa/selftest/cases/runtime_test.py @@ -119,7 +119,7 @@ class TestImage(OESelftestTestCase): if get_bb_var('DISTRO') == 'poky-tiny': self.skipTest('core-image-full-cmdline not buildable for poky-tiny') - features = 'INHERIT += "testimage"\n' + features = 'IMAGE_CLASSES += "testimage"\n' features += 'IMAGE_INSTALL:append = " libssl"\n' features += 'TEST_SUITES = "ping ssh selftest"\n' self.write_config(features) @@ -137,7 +137,7 @@ class TestImage(OESelftestTestCase): if get_bb_var('DISTRO') == 'poky-tiny': self.skipTest('core-image-full-cmdline not buildable for poky-tiny') - features = 'INHERIT += "testimage"\n' + features = 'IMAGE_CLASSES += "testimage"\n' features += 'TEST_SUITES = "ping ssh dnf_runtime dnf.DnfBasicTest.test_dnf_help"\n' # We don't yet know what the server ip and port will be - they will be patched # in at the start of the on-image test @@ -172,7 +172,7 @@ class TestImage(OESelftestTestCase): if get_bb_var('DISTRO') == 'poky-tiny': self.skipTest('core-image-full-cmdline not buildable for poky-tiny') - features = 'INHERIT += "testimage"\n' + features = 'IMAGE_CLASSES += "testimage"\n' features += 'TEST_SUITES = "ping ssh apt.AptRepoTest.test_apt_install_from_repo"\n' # We don't yet know what the server ip and port will be - they will be patched # in at the start of the on-image test @@ -222,7 +222,7 @@ class TestImage(OESelftestTestCase): qemu_packageconfig = get_bb_var('PACKAGECONFIG', 'qemu-system-native') qemu_distrofeatures = get_bb_var('DISTRO_FEATURES', 'qemu-system-native') - features = 'INHERIT += "testimage"\n' + features = 'IMAGE_CLASSES += "testimage"\n' if 'gtk+' not in qemu_packageconfig: features += 'PACKAGECONFIG:append:pn-qemu-system-native = " gtk+"\n' if 'sdl' not in qemu_packageconfig: @@ -267,7 +267,7 @@ class TestImage(OESelftestTestCase): except subprocess.CalledProcessError as e: self.fail("Could not determine the path to dri drivers on the host via pkg-config.\nPlease install Mesa development files (particularly, dri.pc) on the host machine.") qemu_distrofeatures = get_bb_var('DISTRO_FEATURES', 'qemu-system-native') - features = 'INHERIT += "testimage"\n' + features = 'IMAGE_CLASSES += "testimage"\n' if 'opengl' not in qemu_distrofeatures: features += 'DISTRO_FEATURES:append = " opengl"\n' features += 'TEST_SUITES = "ping ssh virgl"\n' From patchwork Fri Aug 12 10:45:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 11320 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9219C282E7 for ; Fri, 12 Aug 2022 10:45:25 +0000 (UTC) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mx.groups.io with SMTP id smtpd.web11.9219.1660301118072566030 for ; Fri, 12 Aug 2022 03:45:18 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=Ai/kdFPW; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.54, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f54.google.com with SMTP id s11-20020a1cf20b000000b003a52a0945e8so350538wmc.1 for ; Fri, 12 Aug 2022 03:45:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=ILzJPQkJQwoZf4NtJR13usooeGpW27kleZ1JZIYDOzA=; b=Ai/kdFPW0+/a113N3F0W1P8BUooD/91ke8IQtE6rpFBRke9jgDg0EzS0Lf1hMLZ1aa EJ58qlecgNG+uOEmGVo550qtWFXIxThomvemjC8QosmPYf/7LjVYSMPZbFUGxzQ+wbQ3 nebIDFf1u+exxpvJzaQnyXsIjRDg3hRLSiU8Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=ILzJPQkJQwoZf4NtJR13usooeGpW27kleZ1JZIYDOzA=; b=wwAGdfWBuXeKWq/rpMsspvtzYtK1TLislQb4lcnY9EnxffyxvTpk9FtKg/HES2ZGRg 3FyDMH/nfwmbvU4ObzS82JznAwrCQfOKPM34ok45fkgpaMhwFeGU62Bd4cAkzoig7W4t yu/5HTUH1m/kVQwGd6Om33P0vBhxYRkwWLsHN4zGYxfHAKKsBIyO7oyGil2AsU1d38Sm vsmlS4UfrfSueqF85mci0LmUS+3PsEmNxwi+LhWFXsMtDwYPGjFgWmZEohekdlAU6UM6 7DPTSHf7xKH6FxkjwqJq/n5MAjPeg0ex4VG5OD+IwzeZxX2X0gSk2+LK0QHht61delhm 428g== X-Gm-Message-State: ACgBeo2Y2lnqLf7B0+zPPAQfQXLKAT2RpbIwtF0np2bMvHdO17j0vz9F QBNIrknRuOQeRxPZE304K8bz82zwevNTsg== X-Google-Smtp-Source: AA6agR5mB0hz52cZDYj0mz+BS7JajZldhaKriAGpl2nChD9geoq/sGln/p5yXYrmkw6qXs5hN2oNJw== X-Received: by 2002:a05:600c:3b1a:b0:3a5:51d8:afce with SMTP id m26-20020a05600c3b1a00b003a551d8afcemr8506036wms.129.1660301116413; Fri, 12 Aug 2022 03:45:16 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:c425:95a5:4141:7147]) by smtp.gmail.com with ESMTPSA id s11-20020a5d69cb000000b00220628ef654sm1587732wrw.24.2022.08.12.03.45.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Aug 2022 03:45:16 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/4] testexport: Use IMAGE_CLASSES for testimage Date: Fri, 12 Aug 2022 11:45:12 +0100 Message-Id: <20220812104514.825820-2-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220812104514.825820-1-richard.purdie@linuxfoundation.org> References: <20220812104514.825820-1-richard.purdie@linuxfoundation.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 12 Aug 2022 10:45:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169278 Signed-off-by: Richard Purdie --- meta/classes/testexport.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/testexport.bbclass b/meta/classes/testexport.bbclass index 1b0fb44a4a8..01656455e84 100644 --- a/meta/classes/testexport.bbclass +++ b/meta/classes/testexport.bbclass @@ -179,4 +179,4 @@ def testexport_create_tarball(d, tar_name, src_dir): tar.close() os.chdir(current_dir) -inherit testimage +IMAGE_CLASSES += "testimage" From patchwork Fri Aug 12 10:45:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 11322 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A1141C25B0E for ; Fri, 12 Aug 2022 10:45:25 +0000 (UTC) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.groups.io with SMTP id smtpd.web12.9215.1660301118933046209 for ; Fri, 12 Aug 2022 03:45:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=btGYSKxn; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.43, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f43.google.com with SMTP id d24-20020a1c7318000000b003a5c1bf4f27so341421wmb.4 for ; Fri, 12 Aug 2022 03:45:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=0bCsZ1SoX9ybRQorcZn6cnh+1mIqa3cphjeptmNN5Ls=; b=btGYSKxn1Foy0ecIcwBRcY6amqGaOhJRbn1HpYzRkgi2+iQMKcHUxVsEO4DYb6ja9D F0VoYWxcOrdQFbL7BooNXpgxlsMYSwjAXxSc7e9uBFB0MKzRmBKEKNzHVV8Er0t44VAf n/duzj0o7lXFfR4DoF54eZiBXwJ8KqXCuUH5o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=0bCsZ1SoX9ybRQorcZn6cnh+1mIqa3cphjeptmNN5Ls=; b=6CEu8p4VMsT56EAWVWa0OCP9UN7d80gy8PCMi6aDn/jWUO3ZN9VZBmMXrPG0XCCzmy vI7ANKJ29Shl+5vktSPCoej8GtH8bBg2a2caSx83iYODN7W+bjZ7XvVucQSh6NOltxVv DSSapJAWe8Vsx34u820X4wM8Zw+vCg7dejk72vjB36LeNtM0oQVhIKWyp+mc8YVjVIUj b/mVo8gFZlaXnkT6ZoEUiWLdtcjkKT0nAOYwLYxvGANeEhCQdV2szZzs6vaJFK1y1/cq TPi9KidXFP6CAuae2dAogD0Yvwqly5aogkPQX0JejAcgtRjZv3Kj4X7sLyKbv+tsEmyX CXAg== X-Gm-Message-State: ACgBeo101VD+lbaHhyaOTFT0IT69ilCPAQguAS7+dD2Sv4PcfBFhH+GV JRnYuK7xXVVffmemtPML5CYpUcCzPw5B8A== X-Google-Smtp-Source: AA6agR5d9nhyjxHVTqt/Wg3iViNWt4zjy59bi7wwLKdIsIzWzm96U7YOJNct8uqY1dzdCAbZuYpjqg== X-Received: by 2002:a05:600c:1e8f:b0:3a4:e0f0:4bad with SMTP id be15-20020a05600c1e8f00b003a4e0f04badmr2216313wmb.133.1660301117159; Fri, 12 Aug 2022 03:45:17 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:c425:95a5:4141:7147]) by smtp.gmail.com with ESMTPSA id s11-20020a5d69cb000000b00220628ef654sm1587732wrw.24.2022.08.12.03.45.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Aug 2022 03:45:16 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/4] testexport: Fix to work as an image class Date: Fri, 12 Aug 2022 11:45:13 +0100 Message-Id: <20220812104514.825820-3-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220812104514.825820-1-richard.purdie@linuxfoundation.org> References: <20220812104514.825820-1-richard.purdie@linuxfoundation.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 12 Aug 2022 10:45:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169279 The class is mainly an image based class but one recipe does need to look at values shared with the class and isn't an image. Move this to a conf file instead, avoiding the need to pollute all recipes globally. Signed-off-by: Richard Purdie --- meta/classes/testexport.bbclass | 5 ++--- meta/conf/testexport.conf | 3 +++ meta/recipes-core/meta/testexport-tarball.bb | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 meta/conf/testexport.conf diff --git a/meta/classes/testexport.bbclass b/meta/classes/testexport.bbclass index 01656455e84..98468c96fd1 100644 --- a/meta/classes/testexport.bbclass +++ b/meta/classes/testexport.bbclass @@ -23,10 +23,9 @@ TEST_TARGET ?= "simpleremote" TEST_TARGET_IP ?= "" TEST_SERVER_IP ?= "" -TEST_EXPORT_SDK_PACKAGES ?= "" +require conf/testexport.conf + TEST_EXPORT_SDK_ENABLED ?= "0" -TEST_EXPORT_SDK_NAME ?= "testexport-tools-nativesdk" -TEST_EXPORT_SDK_DIR ?= "sdk" TEST_EXPORT_DEPENDS = "" TEST_EXPORT_DEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'cpio-native:do_populate_sysroot', '', d)}" diff --git a/meta/conf/testexport.conf b/meta/conf/testexport.conf new file mode 100644 index 00000000000..d7c28de7a75 --- /dev/null +++ b/meta/conf/testexport.conf @@ -0,0 +1,3 @@ +TEST_EXPORT_SDK_PACKAGES ?= "" +TEST_EXPORT_SDK_DIR ?= "sdk" +TEST_EXPORT_SDK_NAME ?= "testexport-tools-nativesdk" \ No newline at end of file diff --git a/meta/recipes-core/meta/testexport-tarball.bb b/meta/recipes-core/meta/testexport-tarball.bb index bb9f8ded48c..abdd0092528 100644 --- a/meta/recipes-core/meta/testexport-tarball.bb +++ b/meta/recipes-core/meta/testexport-tarball.bb @@ -4,7 +4,7 @@ DESCRIPTION = "SDK type target for standalone tarball containing packages define SUMMARY = "Standalone tarball for test systems with missing software" LICENSE = "MIT" -TEST_EXPORT_SDK_PACKAGES ??= "" +require conf/testexport.conf TOOLCHAIN_TARGET_TASK ?= "" From patchwork Fri Aug 12 10:45:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 11319 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F1F8C3F6B0 for ; Fri, 12 Aug 2022 10:45:25 +0000 (UTC) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.groups.io with SMTP id smtpd.web08.9213.1660301120057185119 for ; Fri, 12 Aug 2022 03:45:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=XnoW+1ai; spf=pass (domain: linuxfoundation.org, ip: 209.85.221.47, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wr1-f47.google.com with SMTP id v3so807548wrp.0 for ; Fri, 12 Aug 2022 03:45:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=QhJmQr0Qw1vOjavIOmCv/E+Zir1UW7xtjq4rXJ4sS94=; b=XnoW+1aiS0OAoYWliSsTTDN6RkddR/aaSzQyc1ATyE1n4Tx5LlCVA7UIrMZwle84N+ dUR9ZPD4lUefeJruXTqe+rt9R6f1lPXhtoKF0keCJRRlFWA0mgssUbtvanHB5LYoSSOW 9xS2K8doXTt6MDFuTInBh0/qFZwiNREtiMy9g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=QhJmQr0Qw1vOjavIOmCv/E+Zir1UW7xtjq4rXJ4sS94=; b=1Ril0bSKOPf0Z1V6ETs+PV0vrDzRLIsLsut9b+qL+8hmcN2SNoHHzJ4mIxbg+LgViy kvcBgEuUWz9q/8JahSrHn2K7poK6AYhBO68mc9nikb/hjgsepTqT3t0vll0+7ztLSYk0 WmV3h7QkEVZkxLTDGhzZjqTUc1xvfRlaCHD8LmzzRq0jCCCzaP3lNFaRd88AbyNgURnQ NFRK41HKd+eX0q6DrdUY5VxZIweDkAERuazq+NCfwhjMrjnutKbg8C8bIv1PN/cQNYbF NThmVzADK2zkpwdIkhX7iR92LYCBaI/7/mdh6K5SMl6C3W4nMssguAhhmvvXhxrpLe+Q pkWw== X-Gm-Message-State: ACgBeo01mIDWEZ11VO5X2TMLfJee0PYIvvBfCXaMZigCoHMsJzUYUPBo L7pvNEA0I377/7T9sRRgA0/TqSuhQ/F/2g== X-Google-Smtp-Source: AA6agR7WhprcLc1AM1FdJPsT5p3djMi+KdOmWhzvydpPusdlOzh/CokG/5MQrIemUdQ+uY+l3LI/DA== X-Received: by 2002:a05:6000:985:b0:223:8131:e1f4 with SMTP id by5-20020a056000098500b002238131e1f4mr1759824wrb.65.1660301118017; Fri, 12 Aug 2022 03:45:18 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:c425:95a5:4141:7147]) by smtp.gmail.com with ESMTPSA id s11-20020a5d69cb000000b00220628ef654sm1587732wrw.24.2022.08.12.03.45.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Aug 2022 03:45:17 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 4/4] selftest/runtime_test: Use testexport in IMAGE_CLASSES, not globally Date: Fri, 12 Aug 2022 11:45:14 +0100 Message-Id: <20220812104514.825820-4-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220812104514.825820-1-richard.purdie@linuxfoundation.org> References: <20220812104514.825820-1-richard.purdie@linuxfoundation.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 12 Aug 2022 10:45:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169280 testexport doesn't make sense outside the scope of SDKs and images so use via IMAGE_CLASSES instead of in the global scope. Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/runtime_test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py b/meta/lib/oeqa/selftest/cases/runtime_test.py index 70fff6c6541..0e63e73b629 100644 --- a/meta/lib/oeqa/selftest/cases/runtime_test.py +++ b/meta/lib/oeqa/selftest/cases/runtime_test.py @@ -23,7 +23,7 @@ class TestExport(OESelftestTestCase): Author: Mariano Lopez """ - features = 'INHERIT += "testexport"\n' + features = 'IMAGE_CLASSES += "testexport"\n' # These aren't the actual IP addresses but testexport class needs something defined features += 'TEST_SERVER_IP = "192.168.7.1"\n' features += 'TEST_TARGET_IP = "192.168.7.1"\n' @@ -64,7 +64,7 @@ class TestExport(OESelftestTestCase): Author: Mariano Lopez """ - features = 'INHERIT += "testexport"\n' + features = 'IMAGE_CLASSES += "testexport"\n' # These aren't the actual IP addresses but testexport class needs something defined features += 'TEST_SERVER_IP = "192.168.7.1"\n' features += 'TEST_TARGET_IP = "192.168.7.1"\n'