diff options
| -rwxr-xr-x | automated/linux/spectre-meltdown-checker-test/spectre-meltdown-checker-test.sh | 8 | ||||
| -rw-r--r-- | automated/linux/spectre-meltdown-checker-test/spectre-meltdown-checker-test.yaml | 7 |
2 files changed, 13 insertions, 2 deletions
diff --git a/automated/linux/spectre-meltdown-checker-test/spectre-meltdown-checker-test.sh b/automated/linux/spectre-meltdown-checker-test/spectre-meltdown-checker-test.sh index b54d591..f619257 100755 --- a/automated/linux/spectre-meltdown-checker-test/spectre-meltdown-checker-test.sh +++ b/automated/linux/spectre-meltdown-checker-test/spectre-meltdown-checker-test.sh @@ -40,11 +40,15 @@ parse_smc_output() { grep "SUMMARY" "$1" \ | cut -d' ' -f3-12 \ | sed -e's/ /\n/g' \ - | sed 's/OK/pass/; s/KO/fail/' >> "${RESULT_FILE}" + | sed 's/OK/pass/; s/VULN/fail/; s/KO/fail/; s/UNK/skip/' >> "${RESULT_FILE}" + #TODO + cat "${RESULT_FILE}" } smc_run() { - ./spectre-meltdown-checker.sh | tee "${OUTPUT}/${LOG_FILE}.log" + ./spectre-meltdown-checker.sh --no-color --batch | tee "${OUTPUT}/${LOG_FILE}.log" + #TODO + cat "${OUTPUT}/${LOG_FILE}.log" parse_smc_output "${OUTPUT}/${LOG_FILE}.log" } diff --git a/automated/linux/spectre-meltdown-checker-test/spectre-meltdown-checker-test.yaml b/automated/linux/spectre-meltdown-checker-test/spectre-meltdown-checker-test.yaml index 892141b..55f27d6 100644 --- a/automated/linux/spectre-meltdown-checker-test/spectre-meltdown-checker-test.yaml +++ b/automated/linux/spectre-meltdown-checker-test/spectre-meltdown-checker-test.yaml @@ -30,3 +30,10 @@ run: - cd ./automated/linux/spectre-meltdown-checker-test - ./spectre-meltdown-checker-test.sh -s "${SKIP_INSTALL}" -v "${SMC_VERSION}" -w "${WGET_UPSTREAM}" - ../../utils/send-to-lava.sh ./output/result.txt + +parse: + pattern: "^(?!.+ED)(?P<test_case_id>\\w+)\\s+(?P<result>PASS|FAIL|CONF)\\s+\\d+" + fixupdict: + FAIL: fail + PASS: pass + CONF: skip |