diff options
| -rwxr-xr-x | common/scripts/ptest-lava-wrapper.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/common/scripts/ptest-lava-wrapper.sh b/common/scripts/ptest-lava-wrapper.sh index e49db5d..56a1049 100755 --- a/common/scripts/ptest-lava-wrapper.sh +++ b/common/scripts/ptest-lava-wrapper.sh @@ -1,11 +1,11 @@ #!/bin/bash -REQUIREDPTESTS="busybox" +REQUIREDPTESTS="acl attr bluez5 busybox dbus-test" # Check if ptest packages are installed command -v ptest-runner >/dev/null 2>&1 if [ $? -ne 0 ] ; then - lava-test-case ptest-installed --result FAIL + lava-test-case ptest-installed --result SKIP else # Run ptests for specified packages for unit in ${REQUIREDPTESTS}; do @@ -17,7 +17,10 @@ else # 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 - echo "$UNIT_LOG" | grep -e 'PASS' -e 'FAIL' | sed 's/ /-/g' | sed 's/[^a-z|A-Z|0-9|-]//g' | sed 's/\([^-]*\)-\(.*\)/lava-test-case \2 --result \1/' | sh + 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 + lava-test-case failed-commands --result FAIL --measurement $test_fail --units fail lava-test-set stop ptest-$unit else lava-test-case ptest-runner ${unit} --result fail @@ -27,4 +30,4 @@ else fi # Wait for LAVA to parse all the tests from stdout -sleep 60
\ No newline at end of file +sleep 15 |