From 2f2684984d906e8b6df7865ed813f74484d5c6b4 Mon Sep 17 00:00:00 2001 From: Juro Bystricky Date: Fri, 6 Oct 2017 16:30:46 -0700 Subject: e2fsprogs: modify ptest script e2fsprog testsuite used to log results into its own log file into /usr/lib/e2fsprogs/ptest/test.log. Therefore console output was not available and redirecting ptest-runner output into a log file would not capture output of any individual tests. So overall the whole e2fsprogs testsuite consisting of about 300 tests was evaluated as a single test. This patch ensures the e2fsprogs test_script output is not automatically redirected while executing during run-ptest. Any redirection is up to the user. Additionally, the results of tests are prefixed by more canonical "PASS:" FAIL:" based on the actual test results. Aditionally, remove various files created by the testsuite. [YOCTO #12146] (From OE-Core rev: a218b85dba1a481901548f7414676c0ae6f43316) Signed-off-by: Juro Bystricky Signed-off-by: Richard Purdie --- meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'meta') diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest b/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest index e02fc7f2b9..ef10b08bc8 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest @@ -1,11 +1,10 @@ #!/bin/sh cd ./test -./test_script &>../test.log -if [ $? -eq 0 ] -then - echo "PASS: e2fsprogs" - rm ../test.log -else - echo "FAIL: e2fsprogs" -fi +./test_script | sed -u -e '/:[[:space:]]ok/s/^/PASS: /' -e '/:[[:space:]]failed/s/^/FAIL: /' -e '/:[[:space:]]skipped/s/^/SKIP: /' +rm -rf /var/volatile/tmp/*e2fsprogs* +rm -f tmp-* +rm -f *.tmp +rm -f *.ok +rm -f *.failed +rm -f *.log -- cgit v1.2.3-54-g00ecf