X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fscripts%2Fptest-lava-wrapper-all.sh;h=f7a0b4d8df81a5ff482f68a8287acb2fe10cca0a;hb=611748f8a416db6a79550286d1b7f5093f9a3273;hp=48348bcde53f2afe60f2a8ccc4d9399041515049;hpb=fae09f60bfc400fa7f67a8b5e67286beb086bcf3;p=src%2Fqa-testdefinitions.git diff --git a/common/scripts/ptest-lava-wrapper-all.sh b/common/scripts/ptest-lava-wrapper-all.sh index 48348bc..f7a0b4d 100755 --- a/common/scripts/ptest-lava-wrapper-all.sh +++ b/common/scripts/ptest-lava-wrapper-all.sh @@ -5,31 +5,10 @@ command -v ptest-runner >/dev/null 2>&1 if [ $? -ne 0 ] ; then lava-test-case ptest-installed --result SKIP else - # Run ptests for specified packages - lava-test-set start ptest-full - UNIT_LOG=$(ptest-runner 2> results.log ) - if [ $? -eq 0 ] ; then - # grep: Get only the ptests results, no log - # sed 1: replace spaces by hyphens - # sed 2: remove any special character - # sed 3: find status and test name, wrap it in a lava-test-case call - # sh: execute the lava-test-case commands - test_pass=$(echo "$UNIT_LOG" | grep -e 'PASS' | wc -l) - test_fail=$(echo "$UNIT_LOG" | grep -e 'FAIL' | wc -l) - lava-test-case passed-commands --result PASS --measurement $test_pass --units pass - if ! [ x"0" = x"$test_fail"] ; then - lava-test-case failed-commands --result FAIL --measurement $test_fail --units fail - echo "$UNIT_LOG" | grep -e 'FAIL' - fi - else - lava-test-case ptest-runner ptest-full --result fail - fi - lava-test-set stop ptest-full - done + lava-test-case ptest-installed --result PASS + ptest-runner -L lava-test-case ptest-runtime --measurement $SECONDS --units seconds --result PASS fi # Wait for LAVA to parse all the tests from stdout sleep 15 - -cat results.log