summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorTrevor Gamblin <trevor.gamblin@windriver.com>2019-09-06 14:51:59 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-07 13:08:34 +0100
commit473f170eff13f9c35009a7dca082f35f9e6eac72 (patch)
tree131fc4cba2508bcfac108907beb8cd3764dbc946 /meta
parent0eb98c9d53bbabc37baae40aa84f52ed0b47a13b (diff)
downloadpoky-473f170eff13f9c35009a7dca082f35f9e6eac72.tar.gz
libevent: add granularity to ptest log
The libevent ptest used to report only a global pass or a fail result. Count individual PASS, FAIL, SKIP results. The SKIP results now include tests that are disabled in the libevent code. libevent's ptest output did not comply with the automake-style output "result: testname", and reported a FAIL status at the end of the test run if any of the libevent tests failed. This patch makes the log consistent with the automake style: PASS: http/cancel_by_host_no_ns PASS: http/cancel_inactive_server PASS: http/cancel_by_host_no_ns_inactive_server SKIPPED: http/cancel_by_host_server_timeout SKIPPED: http/cancel_server_timeout and provides a summary as follows: === Test Summary === TOTAL: 316 PASSED: 300 FAILED: 0 SKIPPED: 16 DURATION: 87 END: /usr/lib/libevent/ptest (From OE-Core rev: fb17b46e202cc08277d3eeb34872067c73a6bfbc) Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/libevent/libevent/run-ptest34
-rw-r--r--meta/recipes-support/libevent/libevent_2.1.11.bb3
2 files changed, 25 insertions, 12 deletions
diff --git a/meta/recipes-support/libevent/libevent/run-ptest b/meta/recipes-support/libevent/libevent/run-ptest
index 0241851c70..080806dea9 100644
--- a/meta/recipes-support/libevent/libevent/run-ptest
+++ b/meta/recipes-support/libevent/libevent/run-ptest
@@ -1,18 +1,28 @@
1#!/bin/sh 1#!/bin/sh
2 2
3fail=0 3# run-ptest - 'ptest' test infrastructure shell script that
4# wraps the libevent test scripts
5#
6# Trevor Gamblin <trevor.gamblin@windriver.com>
7###############################################################
8LIBEVENTLIB=@libdir@/libevent
9LOG="${LIBEVENTLIB}/ptest/libevent_ptest_$(date +%Y%m%d-%H%M%S).log"
10
11cd ${LIBEVENTLIB}/ptest
12
4for test in ./test/* 13for test in ./test/*
5do 14do
6 $test 15 $test 2>&1| sed -e '/OK/ s/^/PASS: / ; /FAILED/ s/^/FAIL: / ; /SKIPPED/ s/^/SKIP: / ; /DISABLED/ s/^/SKIP: /' | cut -f1,2 -d ':' | tee -a ${LOG}
7 if [ $? -ne 0 ]
8 then
9 fail=1
10 fi
11done 16done
12 17
13if [ $fail -eq 0 ] 18passed=`grep PASS ${LOG}|wc -l`
14then 19failed=`grep FAIL ${LOG}|wc -l`
15 echo "PASS: libevent" 20skipped=`grep -E SKIP ${LOG}|wc -l`
16else 21all=$((passed + failed + skipped))
17 echo "FAIL: libevent" 22
18fi 23( echo "=== Test Summary ==="
24 echo "TOTAL: ${all}"
25 echo "PASSED: ${passed}"
26 echo "FAILED: ${failed}"
27 echo "SKIPPED: ${skipped}"
28) | tee -a ${LOG}
diff --git a/meta/recipes-support/libevent/libevent_2.1.11.bb b/meta/recipes-support/libevent/libevent_2.1.11.bb
index 1e18f0ab2c..f005ab8bda 100644
--- a/meta/recipes-support/libevent/libevent_2.1.11.bb
+++ b/meta/recipes-support/libevent/libevent_2.1.11.bb
@@ -43,4 +43,7 @@ do_install_ptest() {
43 do 43 do
44 install -m 0755 $file ${D}${PTEST_PATH}/test 44 install -m 0755 $file ${D}${PTEST_PATH}/test
45 done 45 done
46
47 # handle multilib
48 sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest
46} 49}