From 05fa031caab2fdf299fe4a2b3cddcfe2358f9590 Mon Sep 17 00:00:00 2001
From: duerpei <duep.fnst@fujitsu.com>
Date: Wed, 14 Sep 2022 16:32:09 +0800
Subject: [PATCH] agl-test-framework: Bump SRCREV

Bump agl-test-framework SRCREV to include recently added test sets
into the test framework.

Move the installation of the test set scripts to a new bbappend
file, and this will make subsequent maintenance easier.

Bug-AGL: SPEC-4345

Signed-off-by: duerpei <duep.fnst@fujitsu.com>
Change-Id: Iaa08a7eb7d5712a6ff9b38e3d2b28ad8782b506d
---
 .../agl-test-framework/agl-test-framework.bb       | 13 +----
 .../agl-test-framework/agl-test-framework.bbappend | 65 ++++++++++++++++++++++
 2 files changed, 67 insertions(+), 11 deletions(-)
 create mode 100644 meta-agl-test/recipes-tests/agl-test-framework/agl-test-framework.bbappend

diff --git a/meta-agl-test/recipes-tests/agl-test-framework/agl-test-framework.bb b/meta-agl-test/recipes-tests/agl-test-framework/agl-test-framework.bb
index 3360e014..907a9438 100644
--- a/meta-agl-test/recipes-tests/agl-test-framework/agl-test-framework.bb
+++ b/meta-agl-test/recipes-tests/agl-test-framework/agl-test-framework.bb
@@ -7,7 +7,7 @@ PN = 'agl-test-framework'
 PV = '1'
 
 SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/agl-test-framework;protocol=https;branch=master"
-SRCREV = "e35e4d16b0a231ed34a744bcb0a08c1278874df9"
+SRCREV = "50df2b6904dc448c2a8c5ed4f974c631fd97b070"
 
 S = "${WORKDIR}/git"
 
@@ -15,7 +15,7 @@ FILES:${PN} += " \
         /usr/AGL/agl-test/ \
 "
 
-do_install:append() {
+do_install() {
     install -d ${D}/usr/bin/
     install -m 0755 ${WORKDIR}/git/agl-test ${D}/usr/bin/
     install -d ${D}/usr/AGL/agl-test/plugins/
@@ -24,15 +24,6 @@ do_install:append() {
     install -m 0644 ${WORKDIR}/git/plugins/* ${D}/usr/AGL/agl-test/plugins/
     install -d ${D}/usr/AGL/agl-test/template/
     install -m 0644 ${WORKDIR}/git/template/* ${D}/usr/AGL/agl-test/template/
-
-    install -d ${D}/usr/AGL/agl-test/tests/aio-stress/
-    install -m 0644 ${WORKDIR}/git/tests/aio-stress/* ${D}/usr/AGL/agl-test/tests/aio-stress/
-    install -d ${D}/usr/AGL/agl-test/tests/bzip2/
-    install -m 0644 ${WORKDIR}/git/tests/bzip2/* ${D}/usr/AGL/agl-test/tests/bzip2/
-    install -d ${D}/usr/AGL/agl-test/tests/expat/
-    install -m 0644 ${WORKDIR}/git/tests/expat/* ${D}/usr/AGL/agl-test/tests/expat/
-    install -d ${D}/usr/AGL/agl-test/tests/glib2/
-    install -m 0644 ${WORKDIR}/git/tests/glib2/* ${D}/usr/AGL/agl-test/tests/glib2/
 }
 
 RDEPENDS:${PN} += " \
diff --git a/meta-agl-test/recipes-tests/agl-test-framework/agl-test-framework.bbappend b/meta-agl-test/recipes-tests/agl-test-framework/agl-test-framework.bbappend
new file mode 100644
index 00000000..4354eab5
--- /dev/null
+++ b/meta-agl-test/recipes-tests/agl-test-framework/agl-test-framework.bbappend
@@ -0,0 +1,65 @@
+#aio-stress
+do_install:append() {
+    install -d ${D}/usr/AGL/agl-test/tests/aio-stress/
+    install -m 0644 ${WORKDIR}/git/tests/aio-stress/* ${D}/usr/AGL/agl-test/tests/aio-stress/
+}
+
+#bash
+do_install:append() {
+    install -d ${D}/usr/AGL/agl-test/tests/bash/
+    install -m 0644 ${WORKDIR}/git/tests/bash/* ${D}/usr/AGL/agl-test/tests/bash/
+}
+
+#bc
+do_install:append() {
+    install -d ${D}/usr/AGL/agl-test/tests/bc/
+    install -m 0644 ${WORKDIR}/git/tests/bc/* ${D}/usr/AGL/agl-test/tests/bc/
+}
+
+#bzip2
+do_install:append() {
+    install -d ${D}/usr/AGL/agl-test/tests/bzip2/
+    install -m 0644 ${WORKDIR}/git/tests/bzip2/* ${D}/usr/AGL/agl-test/tests/bzip2/
+}
+
+#crashme
+do_install:append() {
+    install -d ${D}/usr/AGL/agl-test/tests/crashme/
+    install -m 0644 ${WORKDIR}/git/tests/crashme/* ${D}/usr/AGL/agl-test/tests/crashme/
+}
+
+#expat
+do_install:append() {
+    install -d ${D}/usr/AGL/agl-test/tests/expat/
+    install -m 0644 ${WORKDIR}/git/tests/expat/* ${D}/usr/AGL/agl-test/tests/expat/
+}
+
+#glib2
+do_install:append() {
+    install -d ${D}/usr/AGL/agl-test/tests/glib2/
+    install -m 0644 ${WORKDIR}/git/tests/glib2/* ${D}/usr/AGL/agl-test/tests/glib2/
+}
+
+#libpam
+do_install:append() {
+    install -d ${D}/usr/AGL/agl-test/tests/libpam/
+    install -m 0644 ${WORKDIR}/git/tests/libpam/* ${D}/usr/AGL/agl-test/tests/libpam/
+}
+
+#libxml2
+do_install:append() {
+    install -d ${D}/usr/AGL/agl-test/tests/libxml2/
+    install -m 0644 ${WORKDIR}/git/tests/libxml2/* ${D}/usr/AGL/agl-test/tests/libxml2/
+}
+
+#openssl
+do_install:append() {
+    install -d ${D}/usr/AGL/agl-test/tests/openssl/
+    install -m 0644 ${WORKDIR}/git/tests/openssl/* ${D}/usr/AGL/agl-test/tests/openssl/
+}
+
+#zlib
+do_install:append() {
+    install -d ${D}/usr/AGL/agl-test/tests/zlib/
+    install -m 0644 ${WORKDIR}/git/tests/zlib/* ${D}/usr/AGL/agl-test/tests/zlib/
+}
-- 
2.16.6