summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrevor Gamblin <trevor.gamblin@windriver.com>2019-09-10 07:56:17 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-11 07:30:08 +0100
commit86b8a1d534bfcd70775c6e2b59eabe10de29f526 (patch)
treed70de8ab3addf59b4ded56eb8257aa28a57e0975
parent7628f6bdb5704c018d83e284364994b72557eaa5 (diff)
downloadopenembedded-core-contrib-master.tar.gz
openembedded-core-contrib-master.tar.bz2
openembedded-core-contrib-master.zip
libevent: don't treat test stats line as pass/fail in ptestHEADmaster
Supplemental to commit fb17b46e2. The libevent "regress" test outputs its own pass/fail results, e.g. "2/300 TESTS FAILED. (31 skipped)", which will be miscounted as an extra test fail in the ptest log. Fixed this to ignore the libevent results line when counting actual pass/fail results. Also removed the for loop in run-ptest and targeted only the libevent "regress" test, as the other tests being run were related to performance and did not provide a relevant pass/fail output. Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/libevent/libevent/run-ptest9
1 files changed, 5 insertions, 4 deletions
diff --git a/meta/recipes-support/libevent/libevent/run-ptest b/meta/recipes-support/libevent/libevent/run-ptest
index 080806dea9..d3b5e793c3 100644
--- a/meta/recipes-support/libevent/libevent/run-ptest
+++ b/meta/recipes-support/libevent/libevent/run-ptest
@@ -10,10 +10,11 @@ LOG="${LIBEVENTLIB}/ptest/libevent_ptest_$(date +%Y%m%d-%H%M%S).log"
cd ${LIBEVENTLIB}/ptest
-for test in ./test/*
-do
- $test 2>&1| sed -e '/OK/ s/^/PASS: / ; /FAILED/ s/^/FAIL: / ; /SKIPPED/ s/^/SKIP: / ; /DISABLED/ s/^/SKIP: /' | cut -f1,2 -d ':' | tee -a ${LOG}
-done
+# Run only the libevent "regress" test. All other test scripts in the
+# libevent "test" folder are related to performance, e.g. read/write
+# rates, and/or do not provide a pass/fail output that can be recorded
+# in the ptest log.
+./test/regress 2>&1| sed -e '/TESTS/d' -e '/tests/d' -e '/OK/ s/^/PASS: / ; /FAILED/ s/^/FAIL: / ; /SKIPPED/ s/^/SKIP: / ; /DISABLED/ s/^/SKIP: /' | cut -f1,2 -d ':' | tee -a ${LOG}
passed=`grep PASS ${LOG}|wc -l`
failed=`grep FAIL ${LOG}|wc -l`