X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fscripts%2Fptest-lava-wrapper.sh;h=8887d29736be4956ad232c447829c5bf6fe07a23;hb=611748f8a416db6a79550286d1b7f5093f9a3273;hp=e49db5dd4b4d465cc92590eeef2b183084dacad8;hpb=14f4baf26da1c9db08cdced214ee7711136a707b;p=src%2Fqa-testdefinitions.git diff --git a/common/scripts/ptest-lava-wrapper.sh b/common/scripts/ptest-lava-wrapper.sh index e49db5d..8887d29 100755 --- a/common/scripts/ptest-lava-wrapper.sh +++ b/common/scripts/ptest-lava-wrapper.sh @@ -1,30 +1,24 @@ #!/bin/bash -REQUIREDPTESTS="busybox" - +REQUIREDPTESTS="acl attr xmlsec1 libxml2 lua" +# NOT: systemd openssl openssh # Check if ptest packages are installed + +echo "Testing these components: $REQUIREDPTESTS" + 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 + lava-test-case ptest-installed --result PASS + # Run ptests for specified packages for unit in ${REQUIREDPTESTS}; do - UNIT_LOG=$(ptest-runner ${unit} 2> /dev/null) - if [ $? -eq 0 ] ; then - lava-test-set start ptest-$unit - # 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 - 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 - lava-test-set stop ptest-$unit - else - lava-test-case ptest-runner ${unit} --result fail - fi + ptest-runner -L ${unit} done + lava-test-case ptest-runtime --measurement $SECONDS --units seconds --result PASS fi # Wait for LAVA to parse all the tests from stdout -sleep 60 \ No newline at end of file +sleep 15