Skip to contentSkip to conversation

Upgrade less and add ptest

PATCH New Julien Stephan 1 participant 3 messages Aug 21, 2023

lore
Share & tools
lore
#0 lore raw

v5 cover Upgrade less and add ptest

Hi all,

Release tarballs now include lesstest so upgrade less to latest version and add ptest support for it.

My branch is available on poky-contrib repository [1]

v1 can be found here: https://lists.openembedded.org/g/openembedded-core/message/183894
v2 can be found here: https://lists.openembedded.org/g/openembedded-core/message/183919
v3 can be found here: https://lists.openembedded.org/g/openembedded-core/message/183931
v4 can be found here: https://lists.openembedded.org/g/openembedded-core/message/183943

Changes in v5:
- do not switch anymore to github URI
- upgrade less to v643
- remove patches that were merged upstream

Changes in v4:
- add verbose output on failure

Changes in v3:
- add locale-base-en-us in RDEPENDS:${PN}-ptest to fix the failing test

Changes in v2:
- split commit in two: one for switching to github and one to add the ptest support

[YOCTO #15073]

Best
Julien

[1]: https://git.yoctoproject.org/poky-contrib/log/?h=jstephan/add-ptest-for-less

Julien Stephan (2):
less: upgrade 633 -> 643
less: add ptest support

 .../distro/include/ptest-packagelists.inc     |  1 +
 meta/recipes-extended/less/files/run-ptest    |  3 +++
 .../less/{less_633.bb => less_643.bb}         | 24 +++++++++++++++++--
 3 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-extended/less/files/run-ptest
 rename meta/recipes-extended/less/{less_633.bb => less_643.bb} (66%)
Signature · 1 line
2.41.0
#1 lore raw

PATCH v5 1/2 less: upgrade 633 -> 643

---
 meta/recipes-extended/less/{less_633.bb => less_643.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-extended/less/{less_633.bb => less_643.bb} (93%)
meta/recipes-extended/less/less_643.bb renamed from meta/recipes-extended/less/less_633.bb +1 -1
similarity index 93%
rename from meta/recipes-extended/less/less_633.bb
rename to meta/recipes-extended/less/less_643.bb
index 2defb5ccb7a..008bbd5581a 100644
@@ -27,7 +27,7 @@ DEPENDS = "ncurses"
 
 SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz"
 
-SRC_URI[sha256sum] = "2f201d64b828b88af36dfe6cfdba3e0819ece2e446ebe6224813209aaefed04f"
+SRC_URI[sha256sum] = "2911b5432c836fa084c8a2e68f6cd6312372c026a58faaa98862731c8b6052e8"
 
 UPSTREAM_CHECK_URI = "http://www.greenwoodsoftware.com/less/download.html"
 
Signature · 1 line
2.41.0
#2 lore raw

PATCH v5 2/2 less: add ptest support

In reply to Julien Stephan

add ptest support for less

root@qemux86-64:~# ptest-runner less
START: ptest-runner
2023-08-21T14:22
BEGIN: /usr/lib/less/ptest
TEST chinese1.lt
PASS: chinese1 (30 steps)
TEST colorbars.lt
PASS: colorbars (222 steps)
TEST github216.lt
PASS: github216 (143 steps)
TEST github265.lt
PASS: github265 (17 steps)
TEST github329.lt
PASS: github329 (28 steps)
TEST hdr-unicode.lt
PASS: hdr-unicode (164 steps)
TEST hdr-unicode1.lt
PASS: hdr-unicode (107 steps)
TEST proc-special.lt
PASS: proc-special (107 steps)
TEST seq200.lt
PASS: seq200 (18 steps)
TEST subsearch.lt
PASS: subsearch (59 steps)
TEST table-50x200.lt
PASS: table-50x200 (467 steps)
TEST utf8-2.txt.lt
PASS: utf8-2.txt (309 steps)
TEST version.c.lt
PASS: version.c (38 steps)
RAN  13 tests with 0 errors
DURATION: 184
END: /usr/lib/less/ptest
2023-08-21T14:25
STOP: ptest-runner
TOTAL: 1 FAIL: 0

[YOCTO #15073]

---
 .../distro/include/ptest-packagelists.inc     |  1 +
 meta/recipes-extended/less/files/run-ptest    |  3 +++
 meta/recipes-extended/less/less_643.bb        | 22 ++++++++++++++++++-
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-extended/less/files/run-ptest
meta/conf/distro/include/ptest-packagelists.inc +1 -0
index bbbef5b0431..9160103cb0a 100644
@@ -96,6 +96,7 @@ PTESTS_SLOW = "\
     glib-2.0 \
     gnutls \
     gstreamer1.0 \
+    less \
     libevent \
     libgcrypt \
     libmodule-build-perl \
meta/recipes-extended/less/files/run-ptest new file +3 -0
new file mode 100644
index 00000000000..42a2869c844
@@ -0,0 +1,3 @@
+#! /bin/sh
+
+./runtest -l /usr/bin/less -t lesstest -O d lt/*
meta/recipes-extended/less/less_643.bb +21 -1
index 008bbd5581a..67834bdd588 100644
@@ -25,17 +25,37 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \
                     "
 DEPENDS = "ncurses"
 
-SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz"
+SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz \
+           file://run-ptest \
+           "
 
 SRC_URI[sha256sum] = "2911b5432c836fa084c8a2e68f6cd6312372c026a58faaa98862731c8b6052e8"
 
 UPSTREAM_CHECK_URI = "http://www.greenwoodsoftware.com/less/download.html"
 
+inherit autotools ptest update-alternatives
+
+EXTRA_OEMAKE += " LESSTEST=1"
+
 inherit autotools update-alternatives
 
+do_compile_ptest () {
+        cd ${S}/lesstest
+        oe_runmake
+}
+
 do_install () {
         oe_runmake 'bindir=${D}${bindir}' 'mandir=${D}${mandir}' install
 }
 
+do_install_ptest () {
+        cp ${S}/lesstest/lesstest ${D}${PTEST_PATH}
+        cp ${S}/lesstest/runtest ${D}${PTEST_PATH}
+        cp ${S}/lesstest/lt_screen ${D}${PTEST_PATH}
+        cp -r ${S}/lesstest/lt ${D}${PTEST_PATH}
+}
+
+RDEPENDS:${PN}-ptest:append = " perl-module-getopt-std perl-module-cwd locale-base-en-us"
+
 ALTERNATIVE:${PN} = "less"
 ALTERNATIVE_PRIORITY = "100"
Signature · 1 line
2.41.0