[OE-core] [PATCH] libusb: ptest: don't skip debug output and fix failures processing
Current run-ptest script prints nothing, when stress tests fail. Fix it in new implementation, discarding external dependency on sed. Also leave in place all stress output, just add standard ptest result. Fixes: 3f0106bf2e41 ("libusb: Add ptest") Signed-off-by: Maksym Kokhan Reviewed-by: Andrii Bordunov --- meta/recipes-support/libusb/libusb1/run-ptest | 32 +++ 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/meta/recipes-support/libusb/libusb1/run-ptest b/meta/recipes-support/libusb/libusb1/run-ptest index 646a966..eaa47a2 100755 --- a/meta/recipes-support/libusb/libusb1/run-ptest +++ b/meta/recipes-support/libusb/libusb1/run-ptest @@ -4,12 +4,26 @@ echo echo " libusb1 tests ---" echo -./stress | tr '\n' ' ' | \ -sed 's/Starting test run: \([a-zA-Z_]*\)\.\.\. \([a-zA-Z_]*\) (.) /\2 \1\n/g' | \ -sed '$d' | \ -sed '{ - s/^Success/PASS:/g - s/^Failure/FAIL:/g - s/^Error/FAIL:/g - s/^Skip/SKIP:/g -}' +./stress | { \ +while read -r str +do + echo "$str" + if [ "${str#*Starting test run:}" != "$str" ] + then + name="${str#Starting test run: }" + name="${name%...}" + else + case "$str" in + "Success (0)") + echo "PASS: $name" + ;; + "Failure (1)" | "Error (2)") + echo "FAIL: $name" + ;; + "Skip (3)") + echo "SKIP: $name" + ;; + esac + fi +done +} -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] libusb: Add ptest
On Mon, Aug 6, 2018 at 7:53 PM Burton, Ross wrote: > > The upgrade to libusb 1.0.22 happened in *May* so please do try and > keep up to date with master. In this case git did managed to merge > anyway, but generally that won't be true. Thank you for your reply, I fixed my mistake so now my patch is up to date with master, and I sent the final patch v3. Thanks, Maksym > > Ross > > On 6 August 2018 at 15:16, Maksym Kokhan via Openembedded-core > wrote: > > The run-ptest script was added to run existing libusb1 tests and libusb1 > > recipe was changed to add ptest support to that package. > > > > Signed-off-by: Maksym Kokhan > > Reviewed-by: Andrii Bordunov > > --- > > meta/recipes-support/libusb/libusb1/run-ptest | 15 +++ > > meta/recipes-support/libusb/libusb1_1.0.21.bb | 11 ++- > > 2 files changed, 25 insertions(+), 1 deletion(-) > > create mode 100755 meta/recipes-support/libusb/libusb1/run-ptest > > > > diff --git a/meta/recipes-support/libusb/libusb1/run-ptest > > b/meta/recipes-support/libusb/libusb1/run-ptest > > new file mode 100755 > > index 000..646a966 > > --- /dev/null > > +++ b/meta/recipes-support/libusb/libusb1/run-ptest > > @@ -0,0 +1,15 @@ > > +#!/bin/sh > > + > > +echo > > +echo " libusb1 tests > > ---" > > +echo > > + > > +./stress | tr '\n' ' ' | \ > > +sed 's/Starting test run: \([a-zA-Z_]*\)\.\.\. \([a-zA-Z_]*\) (.) /\2 > > \1\n/g' | \ > > +sed '$d' | \ > > +sed '{ > > + s/^Success/PASS:/g > > + s/^Failure/FAIL:/g > > + s/^Error/FAIL:/g > > + s/^Skip/SKIP:/g > > +}' > > diff --git a/meta/recipes-support/libusb/libusb1_1.0.21.bb > > b/meta/recipes-support/libusb/libusb1_1.0.21.bb > > index 1fefd14..56822a6 100644 > > --- a/meta/recipes-support/libusb/libusb1_1.0.21.bb > > +++ b/meta/recipes-support/libusb/libusb1_1.0.21.bb > > @@ -10,6 +10,7 @@ BBCLASSEXTEND = "native nativesdk" > > > > SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \ > > file://no-dll.patch \ > > + file://run-ptest \ > >" > > > > SRC_URI[md5sum] = "1da9ea3c27b3858fa85c5f4466003e44" > > @@ -17,7 +18,7 @@ SRC_URI[sha256sum] = > > "7dce9cce9a81194b7065ee912bcd55eeffebab694ea403ffb91b67db66 > > > > S = "${WORKDIR}/libusb-${PV}" > > > > -inherit autotools pkgconfig > > +inherit autotools pkgconfig ptest > > > > # Don't configure udev by default since it will cause a circular > > # dependecy with udev package, which depends on libusb > > @@ -30,6 +31,14 @@ do_install_append() { > > fi > > } > > > > +do_compile_ptest() { > > +oe_runmake -C tests stress > > +} > > + > > +do_install_ptest() { > > +install -m 755 ${B}/tests/.libs/stress ${D}${PTEST_PATH} > > +} > > + > > FILES_${PN} += "${base_libdir}/*.so.*" > > > > FILES_${PN}-dev += "${base_libdir}/*.so ${base_libdir}/*.la" > > -- > > 2.7.4 > > > > -- > > ___ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3] libusb: Add ptest
Add ptest support to libusb package. Uses existing libusb tests. Signed-off-by: Maksym Kokhan Reviewed-by: Andrii Bordunov --- meta/recipes-support/libusb/libusb1/run-ptest | 15 +++ meta/recipes-support/libusb/libusb1_1.0.22.bb | 11 ++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100755 meta/recipes-support/libusb/libusb1/run-ptest diff --git a/meta/recipes-support/libusb/libusb1/run-ptest b/meta/recipes-support/libusb/libusb1/run-ptest new file mode 100755 index 000..17ab436 --- /dev/null +++ b/meta/recipes-support/libusb/libusb1/run-ptest @@ -0,0 +1,15 @@ +#!/bin/sh + +echo +echo " libusb1 tests ---" +echo + +./stress | tr '\n' ' ' | \ +sed 's/Starting test run: \([a-zA-Z_]*\)\.\.\. \([a-zA-Z_]*\) (.) /\2 \1\n/g' | \ +sed '$d' | \ +sed '{ + s/^Success/PASS:/g + s/^Failure/FAIL:/g + s/^Error/FAIL:/g + s/^Skip/SKIP:/g +}' diff --git a/meta/recipes-support/libusb/libusb1_1.0.22.bb b/meta/recipes-support/libusb/libusb1_1.0.22.bb index 766c1c3..3ba1eff 100644 --- a/meta/recipes-support/libusb/libusb1_1.0.22.bb +++ b/meta/recipes-support/libusb/libusb1_1.0.22.bb @@ -10,6 +10,7 @@ BBCLASSEXTEND = "native nativesdk" SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \ file://no-dll.patch \ + file://run-ptest \ " SRC_URI[md5sum] = "466267889daead47674df933cea9cacb" @@ -17,7 +18,7 @@ SRC_URI[sha256sum] = "75aeb9d59a4fdb800d329a545c2e6799f732362193b465ea198f2aa275 S = "${WORKDIR}/libusb-${PV}" -inherit autotools pkgconfig +inherit autotools pkgconfig ptest # Don't configure udev by default since it will cause a circular # dependecy with udev package, which depends on libusb @@ -30,6 +31,14 @@ do_install_append() { fi } +do_compile_ptest() { + oe_runmake -C tests stress +} + +do_install_ptest() { + install -m 755 ${B}/tests/.libs/stress ${D}${PTEST_PATH} +} + FILES_${PN} += "${base_libdir}/*.so.*" FILES_${PN}-dev += "${base_libdir}/*.so ${base_libdir}/*.la" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libusb: Add ptest
The run-ptest script was added to run existing libusb1 tests and libusb1 recipe was changed to add ptest support to that package. Signed-off-by: Maksym Kokhan Reviewed-by: Andrii Bordunov --- meta/recipes-support/libusb/libusb1/run-ptest | 15 +++ meta/recipes-support/libusb/libusb1_1.0.21.bb | 11 ++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100755 meta/recipes-support/libusb/libusb1/run-ptest diff --git a/meta/recipes-support/libusb/libusb1/run-ptest b/meta/recipes-support/libusb/libusb1/run-ptest new file mode 100755 index 000..646a966 --- /dev/null +++ b/meta/recipes-support/libusb/libusb1/run-ptest @@ -0,0 +1,15 @@ +#!/bin/sh + +echo +echo " libusb1 tests ---" +echo + +./stress | tr '\n' ' ' | \ +sed 's/Starting test run: \([a-zA-Z_]*\)\.\.\. \([a-zA-Z_]*\) (.) /\2 \1\n/g' | \ +sed '$d' | \ +sed '{ + s/^Success/PASS:/g + s/^Failure/FAIL:/g + s/^Error/FAIL:/g + s/^Skip/SKIP:/g +}' diff --git a/meta/recipes-support/libusb/libusb1_1.0.21.bb b/meta/recipes-support/libusb/libusb1_1.0.21.bb index 1fefd14..56822a6 100644 --- a/meta/recipes-support/libusb/libusb1_1.0.21.bb +++ b/meta/recipes-support/libusb/libusb1_1.0.21.bb @@ -10,6 +10,7 @@ BBCLASSEXTEND = "native nativesdk" SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \ file://no-dll.patch \ + file://run-ptest \ " SRC_URI[md5sum] = "1da9ea3c27b3858fa85c5f4466003e44" @@ -17,7 +18,7 @@ SRC_URI[sha256sum] = "7dce9cce9a81194b7065ee912bcd55eeffebab694ea403ffb91b67db66 S = "${WORKDIR}/libusb-${PV}" -inherit autotools pkgconfig +inherit autotools pkgconfig ptest # Don't configure udev by default since it will cause a circular # dependecy with udev package, which depends on libusb @@ -30,6 +31,14 @@ do_install_append() { fi } +do_compile_ptest() { +oe_runmake -C tests stress +} + +do_install_ptest() { +install -m 755 ${B}/tests/.libs/stress ${D}${PTEST_PATH} +} + FILES_${PN} += "${base_libdir}/*.so.*" FILES_${PN}-dev += "${base_libdir}/*.so ${base_libdir}/*.la" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libusb: Add ptest
Add ptest support to libusb package. Uses existing libusb tests. Signed-off-by: Maksym Kokhan Reviewed-by: Andrii Bordunov --- meta/recipes-support/libusb/libusb1/run-ptest | 15 +++ meta/recipes-support/libusb/libusb1_1.0.21.bb | 11 ++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100755 meta/recipes-support/libusb/libusb1/run-ptest diff --git a/meta/recipes-support/libusb/libusb1/run-ptest b/meta/recipes-support/libusb/libusb1/run-ptest new file mode 100755 index 000..646a966 --- /dev/null +++ b/meta/recipes-support/libusb/libusb1/run-ptest @@ -0,0 +1,15 @@ +#!/bin/sh + +echo +echo " libusb1 tests ---" +echo + +./stress | tr '\n' ' ' | \ +sed 's/Starting test run: \([a-zA-Z_]*\)\.\.\. \([a-zA-Z_]*\) (.) /\2 \1\n/g' | \ +sed '$d' | \ +sed '{ + s/^Success/PASS:/g + s/^Failure/FAIL:/g + s/^Error/FAIL:/g + s/^Skip/SKIP:/g +}' diff --git a/meta/recipes-support/libusb/libusb1_1.0.21.bb b/meta/recipes-support/libusb/libusb1_1.0.21.bb index 1fefd14..073de38 100644 --- a/meta/recipes-support/libusb/libusb1_1.0.21.bb +++ b/meta/recipes-support/libusb/libusb1_1.0.21.bb @@ -10,6 +10,7 @@ BBCLASSEXTEND = "native nativesdk" SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \ file://no-dll.patch \ + file://run-ptest \ " SRC_URI[md5sum] = "1da9ea3c27b3858fa85c5f4466003e44" @@ -17,7 +18,7 @@ SRC_URI[sha256sum] = "7dce9cce9a81194b7065ee912bcd55eeffebab694ea403ffb91b67db66 S = "${WORKDIR}/libusb-${PV}" -inherit autotools pkgconfig +inherit autotools pkgconfig ptest # Don't configure udev by default since it will cause a circular # dependecy with udev package, which depends on libusb @@ -30,6 +31,14 @@ do_install_append() { fi } +do_compile_ptest() { +oe_runmake -C tests stress +} + +do_install_ptest() { +install -m 755 ${WORKDIR}/build/tests/.libs/stress ${D}${PTEST_PATH} +} + FILES_${PN} += "${base_libdir}/*.so.*" FILES_${PN}-dev += "${base_libdir}/*.so ${base_libdir}/*.la" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core