From 7cb7808d2afeb30e14f81e9e15660beb566a326a Mon Sep 17 00:00:00 2001
From: Marta Rybczynska <marta.rybczynska@linaro.org>
Date: Thu, 8 Dec 2022 15:35:14 +0100
Subject: [PATCH] distro: remove ptest from DISTRO_FEATURES in production
builds
Test and debug images use ptest for runtime testing. However, it is not
used in production builds, and should not be. They add to the build time.
From our results, a build of oniro-image-base with ptest takes 160min,
while without it is only 110 min.
oniro-image-extra-test was the only test image that wasn't adding this
DISTRO_FEATURE explicitly.
Signed-off-by: Marta Rybczynska <marta.rybczynska@linaro.org>
---
meta-oniro-core/conf/distro/oniro-linux.conf | 2 +-
meta-oniro-core/recipes-core/images/oniro-image-extra-tests.bb | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta-oniro-core/conf/distro/oniro-linux.conf b/meta-oniro-core/conf/distro/oniro-linux.conf
index 7aaf9843..300a1d0c 100644
--- a/meta-oniro-core/conf/distro/oniro-linux.conf
+++ b/meta-oniro-core/conf/distro/oniro-linux.conf
@@ -18,7 +18,7 @@ DISTRO_VERSION[vardepsexclude] = "DATE"
SDK_VERSION[vardepsexclude] = "DATE"
# Override these in oniro based distros
-ONIRO_DEFAULT_DISTRO_FEATURES = "largefile opengl ptest multiarch pam rauc security tpm tpm2 wayland vulkan virtualization"
+ONIRO_DEFAULT_DISTRO_FEATURES = "largefile opengl multiarch pam rauc security tpm tpm2 wayland vulkan virtualization"
ONIRO_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot"
ONIRO_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet"
diff --git a/meta-oniro-core/recipes-core/images/oniro-image-extra-tests.bb b/meta-oniro-core/recipes-core/images/oniro-image-extra-tests.bb
index 1adbb763..4ee7eb28 100644
--- a/meta-oniro-core/recipes-core/images/oniro-image-extra-tests.bb
+++ b/meta-oniro-core/recipes-core/images/oniro-image-extra-tests.bb
@@ -7,6 +7,8 @@ require recipes-core/images/oniro-image-extra.bb
SUMMARY = "Oniro Project Wayland image including the base OS \
software stack and tests"
+DISTRO_FEATURES:append = " ptest"
+
IMAGE_INSTALL:append = "\
packagegroup-oniro-tests \
"
--
GitLab