From 82855a1a84cab1f9b551dc126fca0560d725e4ec Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Tue, 13 Dec 2022 12:10:55 +0100
Subject: [PATCH] ptest-packagelists.inc: correctly assign fast and slow tests

The execution times were checked from
https://autobuilder.yocto.io/pub/non-release/20221127-2/testresults/qemux86-64-ptest/core-image-ptest-all/log.do_testimage.40537.20221127010849
and ptests were moved both ways according to the same criteria:
more than 30 seconds or less.

openssl is dropped from fast tests, as it is also listed in slow
tests (which is correct).

With the rearrangement fast ptests altogether take about 420 seconds
on qemux86_64 with kvm.

m4 ptest was missing a depedency.

(From OE-Core rev: e15ad965f22fe14270274687eff9849256a74fec)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../distro/include/ptest-packagelists.inc     | 21 +++++++++----------
 meta/recipes-devtools/m4/m4-1.4.19.inc        |  1 +
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc
index 79de9b00ae..48dec07577 100644
--- a/meta/conf/distro/include/ptest-packagelists.inc
+++ b/meta/conf/distro/include/ptest-packagelists.inc
@@ -5,22 +5,22 @@
 #
 PTESTS_FAST = "\
     acl-ptest \
-    apr-ptest \
     apr-util-ptest \
     attr-ptest \
+    babeltrace-ptest \
+    babeltrace2-ptest \
     bc-ptest \
     bluez5-ptest \
-    bzip2-ptest \
+    busybox-ptest \
     diffstat-ptest \
     diffutils-ptest \
-    elfutils-ptest \
     ethtool-ptest \
     expat-ptest \
+    findutils-ptest \
     flex-ptest \
     gawk-ptest \
     gdbm-ptest \
     gdk-pixbuf-ptest \
-    gettext-ptest \
     glib-networking-ptest \
     gzip-ptest \
     json-c-ptest \
@@ -29,7 +29,6 @@ PTESTS_FAST = "\
     liberror-perl-ptest \
     libgpg-error-ptest\
     libnl-ptest \
-    libmodule-build-perl-ptest \
     libpcre-ptest \
     libssh2-ptest \
     libtimedate-perl-ptest \
@@ -50,10 +49,8 @@ PTESTS_FAST = "\
     lzo-ptest \
     m4-ptest \
     nettle-ptest \
-    openssl-ptest \
     opkg-ptest \
     pango-ptest \
-    parted-ptest \
     popt-ptest \
     python3-atomicwrites-ptest \
     python3-bcrypt-ptest \
@@ -82,21 +79,23 @@ PTESTS_FAST:remove:riscv32 = "qemu-ptest"
 PTESTS_PROBLEMS:append:riscv32 = " qemu-ptest"
 
 PTESTS_SLOW = "\
-    babeltrace-ptest \
-    babeltrace2-ptest \
-    busybox-ptest \
+    apr-ptest \
+    bzip2-ptest \
     coreutils-ptest \
     curl-ptest \
     dbus-ptest \
     e2fsprogs-ptest \
-    findutils-ptest \
+    elfutils-ptest \
+    gettext-ptest \
     glib-2.0-ptest \
     gstreamer1.0-ptest \
     libevent-ptest \
     libgcrypt-ptest \
+    libmodule-build-perl-ptest \
     lttng-tools-ptest \
     openssh-ptest \
     openssl-ptest \
+    parted-ptest \
     perl-ptest \
     python3-cryptography-ptest \
     python3-ptest \
diff --git a/meta/recipes-devtools/m4/m4-1.4.19.inc b/meta/recipes-devtools/m4/m4-1.4.19.inc
index 2adf4de6f2..6ee9742277 100644
--- a/meta/recipes-devtools/m4/m4-1.4.19.inc
+++ b/meta/recipes-devtools/m4/m4-1.4.19.inc
@@ -54,6 +54,7 @@ do_install_ptest() {
 
 RDEPENDS:${PN}-ptest += "make coreutils diffutils"
 RDEPENDS:${PN}-ptest:append:libc-glibc = "\
+     locale-base-fr-fr \
      locale-base-fr-fr.iso-8859-1 \
 "