From 0b61b17445a45cd704f2dc1820423159f544b282 Mon Sep 17 00:00:00 2001 From: Alex Stewart Date: Fri, 13 Sep 2024 11:32:56 -0400 Subject: [PATCH 1/4] nilrt-snac: add integration ptests The nilrt-snac project now has an integration test suite. Add a run-ptest entrypoint and pytest subpackage to run it. Signed-off-by: Alex Stewart --- recipes-ni/nilrt-snac/files/run-ptest | 8 ++++++++ recipes-ni/nilrt-snac/nilrt-snac_git.bb | 17 ++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 recipes-ni/nilrt-snac/files/run-ptest diff --git a/recipes-ni/nilrt-snac/files/run-ptest b/recipes-ni/nilrt-snac/files/run-ptest new file mode 100644 index 000000000..053978fee --- /dev/null +++ b/recipes-ni/nilrt-snac/files/run-ptest @@ -0,0 +1,8 @@ +#!/usr/bin/env python3 + +import pytest + +pytest.main([ + "-v", + "/usr/lib/nilrt-snac/tests/integration", +]) diff --git a/recipes-ni/nilrt-snac/nilrt-snac_git.bb b/recipes-ni/nilrt-snac/nilrt-snac_git.bb index c03a4d35e..4e00ccffb 100644 --- a/recipes-ni/nilrt-snac/nilrt-snac_git.bb +++ b/recipes-ni/nilrt-snac/nilrt-snac_git.bb @@ -10,23 +10,38 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=380df876633ca23587b9851600778cc0" SRC_URI = "\ git://github.com/ni/nilrt-snac;branch=master;protocol=https \ + file://run-ptest \ " - SRCREV = "${AUTOREV}" PV = "0.1.1+git${SRCPV}" S = "${WORKDIR}/git" +inherit ptest + + do_install() { oe_runmake install \ DESTDIR=${D} } +do_install_ptest() { + install -m 0755 ${WORKDIR}/run-ptest ${D}${PTEST_PATH} +} + RDEPENDS:${PN} = "\ bash \ opkg \ python3-core \ " + +FILES:${PN}-ptest += "${libdir}/${PN}/tests/integration" +RDEPENDS:${PN}-ptest = "\ + bash \ + nilrt-snac \ + python3-core \ + python3-pytest \ +" From 45a30796e758b2f5924dc2498fbeb86df5156854 Mon Sep 17 00:00:00 2001 From: Alex Stewart Date: Fri, 13 Sep 2024 11:34:27 -0400 Subject: [PATCH 2/4] pkggrp-ni-smoke: use tabs for indentation Signed-off-by: Alex Stewart --- .../packagegroup-ni-ptest-smoke.bb | 86 +++++++++---------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/recipes-core/packagegroups/packagegroup-ni-ptest-smoke.bb b/recipes-core/packagegroups/packagegroup-ni-ptest-smoke.bb index b0222d41a..c00e074d7 100644 --- a/recipes-core/packagegroups/packagegroup-ni-ptest-smoke.bb +++ b/recipes-core/packagegroups/packagegroup-ni-ptest-smoke.bb @@ -13,47 +13,47 @@ RDEPENDS:${PN} = "ptest-runner" # ptest packages RDEPENDS:${PN}:append = "\ - busybox-ptest \ - bzip2-ptest \ - coreutils-ptest \ - docker-functional-tests-ptest \ - e2fsprogs-ptest \ - elfutils-ptest \ - ethtool-ptest \ - flex-ptest \ - gettext-ptest \ - glibc-locale-tests-ptest \ - glibc-tests-ptest \ - kernel-tests-ptest \ - liberror-perl-ptest \ - libxml2-ptest \ - mdadm-ptest \ - nettle-ptest \ - ni-hw-scripts-ptest \ - ni-test-boot-time-ptest \ - opkg-ptest \ - pango-ptest \ - parted-ptest \ - perl-ptest \ - pstore-save-ptest \ - python3-appdirs-ptest \ - python3-atomicwrites-ptest \ - python3-bcrypt-ptest \ - python3-cryptography-ptest \ - python3-markupsafe-ptest \ - python3-more-itertools-ptest \ - python3-msgpack-ptest \ - python3-multidict-ptest \ - python3-pluggy-ptest \ - python3-pyasn1-ptest \ - python3-pyroute2-ptest \ - python3-pyserial-ptest \ - python3-pytz-ptest \ - python3-wcwidth-ptest \ - rt-tests-ptest \ - run-postinsts-ptest \ - sed-ptest \ - util-linux-ptest \ - xorg-fonts-100dpi-ptest \ - zeromq-ptest \ + busybox-ptest \ + bzip2-ptest \ + coreutils-ptest \ + docker-functional-tests-ptest \ + e2fsprogs-ptest \ + elfutils-ptest \ + ethtool-ptest \ + flex-ptest \ + gettext-ptest \ + glibc-locale-tests-ptest \ + glibc-tests-ptest \ + kernel-tests-ptest \ + liberror-perl-ptest \ + libxml2-ptest \ + mdadm-ptest \ + nettle-ptest \ + ni-hw-scripts-ptest \ + ni-test-boot-time-ptest \ + opkg-ptest \ + pango-ptest \ + parted-ptest \ + perl-ptest \ + pstore-save-ptest \ + python3-appdirs-ptest \ + python3-atomicwrites-ptest \ + python3-bcrypt-ptest \ + python3-cryptography-ptest \ + python3-markupsafe-ptest \ + python3-more-itertools-ptest \ + python3-msgpack-ptest \ + python3-multidict-ptest \ + python3-pluggy-ptest \ + python3-pyasn1-ptest \ + python3-pyroute2-ptest \ + python3-pyserial-ptest \ + python3-pytz-ptest \ + python3-wcwidth-ptest \ + rt-tests-ptest \ + run-postinsts-ptest \ + sed-ptest \ + util-linux-ptest \ + xorg-fonts-100dpi-ptest \ + zeromq-ptest \ " From b83c29f0fd269e26ad7086ae98b884e7a3b9f54b Mon Sep 17 00:00:00 2001 From: Alex Stewart Date: Fri, 13 Sep 2024 11:35:19 -0400 Subject: [PATCH 3/4] pkggrp-ni-ptest-smoke: add nilrt-snac-ptest Signed-off-by: Alex Stewart --- recipes-core/packagegroups/packagegroup-ni-ptest-smoke.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-core/packagegroups/packagegroup-ni-ptest-smoke.bb b/recipes-core/packagegroups/packagegroup-ni-ptest-smoke.bb index c00e074d7..b4a328a8f 100644 --- a/recipes-core/packagegroups/packagegroup-ni-ptest-smoke.bb +++ b/recipes-core/packagegroups/packagegroup-ni-ptest-smoke.bb @@ -31,6 +31,7 @@ RDEPENDS:${PN}:append = "\ nettle-ptest \ ni-hw-scripts-ptest \ ni-test-boot-time-ptest \ + nilrt-snac-ptest \ opkg-ptest \ pango-ptest \ parted-ptest \ From cdc74e4d56cb08edec60e30931c1bc8234d42f2c Mon Sep 17 00:00:00 2001 From: Alex Stewart Date: Fri, 13 Sep 2024 13:36:06 -0400 Subject: [PATCH 4/4] nilrt_snac: remove unneeded RDEPENDS The ptest.bbclass already adds an RDEPENDS on `nilrt-snac`, but it is overriden by the nilrt-snac-ptest RDEPENDS bb assignment. Instead, append the ptest RDEPENDS. Signed-off-by: Alex Stewart --- recipes-ni/nilrt-snac/nilrt-snac_git.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes-ni/nilrt-snac/nilrt-snac_git.bb b/recipes-ni/nilrt-snac/nilrt-snac_git.bb index 4e00ccffb..9e559e798 100644 --- a/recipes-ni/nilrt-snac/nilrt-snac_git.bb +++ b/recipes-ni/nilrt-snac/nilrt-snac_git.bb @@ -39,9 +39,8 @@ RDEPENDS:${PN} = "\ " FILES:${PN}-ptest += "${libdir}/${PN}/tests/integration" -RDEPENDS:${PN}-ptest = "\ +RDEPENDS:${PN}-ptest += "\ bash \ - nilrt-snac \ python3-core \ python3-pytest \ "