summaryrefslogtreecommitdiff
path: root/automated
diff options
context:
space:
mode:
Diffstat (limited to 'automated')
-rwxr-xr-xautomated/lib/sh-test-lib6
-rwxr-xr-xautomated/utils/send-to-lava.sh8
2 files changed, 9 insertions, 5 deletions
diff --git a/automated/lib/sh-test-lib b/automated/lib/sh-test-lib
index b02c121..3b2ab43 100755
--- a/automated/lib/sh-test-lib
+++ b/automated/lib/sh-test-lib
@@ -129,9 +129,9 @@ report_fail() {
}
add_metric() {
- if [ "$#" -ne 4 ]; then
- warn_msg "The number of parameters less then 4"
- error_msg "Usage: add_metric test_case result measurement units"
+ if [ "$#" -lt 3 ]; then
+ warn_msg "The number of parameters less then 3"
+ error_msg "Usage: add_metric test_case result measurement [units]"
fi
test_case="$1"
result="$2"
diff --git a/automated/utils/send-to-lava.sh b/automated/utils/send-to-lava.sh
index 9660b97..ace3de9 100755
--- a/automated/utils/send-to-lava.sh
+++ b/automated/utils/send-to-lava.sh
@@ -16,14 +16,18 @@ if [ -f "${RESULT_FILE}" ]; then
else
echo "<TEST_CASE_ID=${test} RESULT=${result}>"
fi
- elif echo "${line}" | egrep -iq ".*+ (pass|fail|skip)+ .*+ .*"; then
+ elif echo "${line}" | egrep -iq ".*+ (pass|fail|skip)+ .*+"; then
test="$(echo "${line}" | awk '{print $1}')"
result="$(echo "${line}" | awk '{print $2}')"
measurement="$(echo "${line}" | awk '{print $3}')"
units="$(echo "${line}" | awk '{print $4}')"
if [ "${lava_test_case}" -eq 0 ]; then
- lava-test-case "${test}" --result "${result}" --measurement "${measurement}" --units "${units}"
+ if [ -n "${units}" ]; then
+ lava-test-case "${test}" --result "${result}" --measurement "${measurement}" --units "${units}"
+ else
+ lava-test-case "${test}" --result "${result}" --measurement "${measurement}"
+ fi
else
echo "<TEST_CASE_ID=${test} RESULT=${result} UNITS=${units} MEASUREMENT=${measurement}>"
fi