kvm-unit-tests: output test results in TAP13 format
This patch introduces TAP13 results format of kvm-unit-tests by
adding flag '-t|--tap13' to kvm-unit-tests run_tests.sh script,
it menas that the test results output in a TAP13 format.
The new script, parse-output.py, to handle the parsing of kvm-unit-tests
outputs. The script reads input from the standard input, processes each
line to determine the test results as the LAVA understand.
e.g.
<test-name> <pass|fail|skip>
Signed-off-by: Naresh Kamboju <naresh.kamboju@linaro.org>
diff --git a/automated/linux/kvm-unit-tests/kvm-unit-tests.sh b/automated/linux/kvm-unit-tests/kvm-unit-tests.sh
index f9c92fa..57311d0 100755
--- a/automated/linux/kvm-unit-tests/kvm-unit-tests.sh
+++ b/automated/linux/kvm-unit-tests/kvm-unit-tests.sh
@@ -27,26 +27,16 @@
done
parse_output() {
- # Parse each type of results
- # A note on the sed line used below to strip color codes:
- # busybox's sed does not implement e.g. '\x1b', and so the literal
- # control code is used below. Do not copy/paste it, or it will lose
- # its magic.
- grep -e PASS -e SKIP -e FAIL "${RESULT_LOG}" | \
- sed 's/\[[0-9]*m//g' | \
- sed -e 's/PASS/pass/g' \
- -e 's/SKIP/skip/g' \
- -e 's/FAIL/fail/g' | \
- awk '{print $2" "$1}' >> "${RESULT_FILE}"
- cat "${RESULT_FILE}"
+ # Parse input test names and results log to results file
+ ./parse-output.py < "${RESULT_LOG}" | tee -a "${RESULT_FILE}"
}
kvm_unit_tests_run_test() {
info_msg "running kvm unit tests ..."
if [ "${SMP}" = "false" ]; then
- taskset -c 0 ./run_tests.sh -a -v | tee -a "${RESULT_LOG}"
+ taskset -c 0 ./run_tests.sh -a -t -v | tee -a "${RESULT_LOG}"
else
- ./run_tests.sh -a -v | tee -a "${RESULT_LOG}"
+ ./run_tests.sh -a -t -v | tee -a "${RESULT_LOG}"
fi
}
@@ -84,8 +74,6 @@
# Test run.
! check_root && error_msg "This script must be run as root"
create_out_dir "${OUTPUT}"
-# shellcheck disable=SC2164
-cd "${OUTPUT}"
info_msg "About to run kvm unit tests ..."
info_msg "Output directory: ${OUTPUT}"
@@ -107,6 +95,7 @@
# Run kvm unit tests
kvm_unit_tests_run_test
+cd - || exit 1
# Parse and print kvm unit tests results
parse_output
diff --git a/automated/linux/kvm-unit-tests/parse-output.py b/automated/linux/kvm-unit-tests/parse-output.py
new file mode 100755
index 0000000..5d433a6
--- /dev/null
+++ b/automated/linux/kvm-unit-tests/parse-output.py
@@ -0,0 +1,68 @@
+#!/usr/bin/env python3
+import sys
+import re
+
+
+def parse_line(line):
+ """
+ Parses a single line of input to extract the test result and description.
+
+ Args:
+ line (str): A single line of input.
+
+ Returns:
+ tuple: A tuple containing the result and description.
+ """
+
+ if not line.startswith("ok") and not line.startswith("not ok"):
+ return None, None
+
+ parts = re.split(r" \d+ - ", line)
+ if len(parts) < 2:
+ raise ValueError(f"Invalid line format: {line}")
+
+ result = "pass" if parts[0] == "ok" else "fail"
+ description = parts[1].strip()
+
+ if "# skip" in description.lower():
+ result = "skip"
+ description = description.split("# skip")[0].strip()
+
+ return result, description
+
+
+def sanitize_description(description):
+ """
+ Sanitizes the description by replacing spaces with dashes, removing special characters, and avoiding double dashes.
+
+ Args:
+ description (str): The test description.
+
+ Returns:
+ str: The sanitized description.
+ """
+ description = description.replace(" ", "-")
+ description = re.sub(r"[^a-zA-Z0-9_-]+", "", description) # Slugify
+ description = re.sub(
+ r"-+", "-", description
+ ) # Replace multiple dashes with a single dash
+ return description
+
+
+def main():
+ """
+ Main function to parse input, process each line, and output the results.
+ """
+ lines = sys.stdin.readlines()
+
+ for line in lines:
+ result, description = parse_line(line)
+
+ if not result or not description:
+ continue
+
+ print(f"{sanitize_description(description)} {result}")
+
+
+if __name__ == "__main__":
+ main()