From 0e6359ea5034d0cedc1e1f66a4340e38f8fe8ae1 Mon Sep 17 00:00:00 2001 From: duerpei Date: Thu, 30 Jun 2022 14:09:04 +0800 Subject: meta-agl-test: updates due to framework adjustment Due to the previous framework adjustment, the scripts for running glib2 tests has been moved to 'agl-test-framework'. And rpm will support its ptest later, and then its scripts will also be placed under 'agl-test-framework'. So 'agl-test-glib2.bb' and 'agl-test-rpm.bb' are no longer needed The content under 'agl-test-framework' has changed, so 'agl-test-framework.bb' has also been updated. Bug-AGL: SPEC-4345 Signed-off-by: duerpei Change-Id: Ia6dd71966e5ba18cbb5cb81fb594d4fc3722db27 --- .../packagegroup/packagegroup-agl-extend-test.bb | 2 -- .../agl-test-framework/agl-test-framework.bb | 6 +++- .../recipes-tests/glib2/agl-test-glib2.bb | 29 ------------------- meta-agl-test/recipes-tests/rpm/agl-test-rpm.bb | 33 ---------------------- 4 files changed, 5 insertions(+), 65 deletions(-) delete mode 100644 meta-agl-test/recipes-tests/glib2/agl-test-glib2.bb delete mode 100644 meta-agl-test/recipes-tests/rpm/agl-test-rpm.bb diff --git a/meta-agl-test/recipes-platform/packagegroup/packagegroup-agl-extend-test.bb b/meta-agl-test/recipes-platform/packagegroup/packagegroup-agl-extend-test.bb index dae13630..e12fb163 100644 --- a/meta-agl-test/recipes-platform/packagegroup/packagegroup-agl-extend-test.bb +++ b/meta-agl-test/recipes-platform/packagegroup/packagegroup-agl-extend-test.bb @@ -11,6 +11,4 @@ ALLOW_EMPTY:${PN} = "1" RDEPENDS:${PN} += " \ agl-test-framework \ - agl-test-rpm \ - agl-test-glib2 \ " 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 2fd190ad..3bef56c2 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 = "aa5fab53993f29311f1aef83488eb0f759dabca8" +SRCREV = "73a0548851b101d58478bfe7e60d9a74b334dcb9" S = "${WORKDIR}/git" @@ -22,6 +22,10 @@ do_install:append() { install -m 0644 ${WORKDIR}/git/pytest.ini ${D}/usr/AGL/agl-test/ install -m 0644 ${WORKDIR}/git/conftest.py ${D}/usr/AGL/agl-test/ 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/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/glib2/agl-test-glib2.bb b/meta-agl-test/recipes-tests/glib2/agl-test-glib2.bb deleted file mode 100644 index fe0da800..00000000 --- a/meta-agl-test/recipes-tests/glib2/agl-test-glib2.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Glib2 Test" -HOMEPAGE = "https://git.automotivelinux.org/src/qa-test-misc/" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -PN = 'agl-test-glib2' -PV = '1' - -FILESEXTRAPATHS:append := "${TMPDIR}/work/aarch64-agl-linux/qa-test-misc/1-r0/git/:" -SRC_URI = "file://glib2/ \ - file://LICENSE " - -do_fetch[depends] = "qa-test-misc:do_unpack" - -S = "${WORKDIR}" - -FILES:${PN} += " \ - /usr/AGL/agl-test/tests/glib2 \ -" - -do_install:append() { - install -d ${D}/usr/AGL/agl-test/tests/glib2/ - install -m 0644 ${WORKDIR}/glib2/rootfs-scripts/*.py ${D}/usr/AGL/agl-test/tests/glib2/ -} - -RDEPENDS:${PN} += " \ - agl-test-framework \ - glib-2.0 \ -" diff --git a/meta-agl-test/recipes-tests/rpm/agl-test-rpm.bb b/meta-agl-test/recipes-tests/rpm/agl-test-rpm.bb deleted file mode 100644 index 94e9da95..00000000 --- a/meta-agl-test/recipes-tests/rpm/agl-test-rpm.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Rpm Test Set" -HOMEPAGE = "https://git.automotivelinux.org/src/qa-test-misc/" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -PN = 'agl-test-rpm' -PV = '1' - -FILESEXTRAPATHS:append := "${TMPDIR}/work/aarch64-agl-linux/qa-test-misc/1-r0/git/:" - -SRC_URI = "file://rpm/ \ - file://LICENSE " - -do_fetch[depends] = "qa-test-misc:do_unpack" - -S = "${WORKDIR}" - -FILES:${PN} += " \ - /usr/AGL/agl-test/tests/rpm \ -" - -do_install:append() { - install -d ${D}/usr/AGL/agl-test/tests/rpm/resource/tests/ - install -m 0644 ${WORKDIR}/rpm/rootfs-scripts/*.py ${D}/usr/AGL/agl-test/tests/rpm/ - install -m 0644 ${WORKDIR}/rpm/rootfs-scripts/resource/rpm_test.sh ${D}/usr/AGL/agl-test/tests/rpm/resource/ - install -m 0644 ${WORKDIR}/rpm/rootfs-scripts/resource/test-manual-1.2.3.noarch.rpm ${D}/usr/AGL/agl-test/tests/rpm/resource/ - install -m 0644 ${WORKDIR}/rpm/rootfs-scripts/resource/tests/* ${D}/usr/AGL/agl-test/tests/rpm/resource/tests/ -} - -RDEPENDS:${PN} += " \ - agl-test-framework \ - rpm \ -" -- cgit 1.2.3-korg