lava_helper: Capture assertion error
Capture assertion crash cases and mark them as fail.[1]
[1]: https://linaro.atlassian.net/browse/TFC-783
Signed-off-by: Arthur She <arthur.she@linaro.org>
Change-Id: I8e8609a91f5622a595b449f5f885a0e6f66e6cbd
diff --git a/lava_helper/jinja2_templates/fvp_corstone1000.jinja2 b/lava_helper/jinja2_templates/fvp_corstone1000.jinja2
index fe6d297..8325bcd 100644
--- a/lava_helper/jinja2_templates/fvp_corstone1000.jinja2
+++ b/lava_helper/jinja2_templates/fvp_corstone1000.jinja2
@@ -76,6 +76,9 @@
fixupdict:
'{{monitor.fixup.pass}}': pass
'{{monitor.fixup.fail}}': fail
+ {%- if monitor.fixup.assertion_fail%}
+ '{{monitor.fixup.assertion_fail}}': fail
+ {%- endif %}
{%- if monitor.fixup.skip %}
'{{monitor.fixup.skip}}': skip
{%- endif %}
diff --git a/lava_helper/lava_helper_configs.py b/lava_helper/lava_helper_configs.py
index 4457699..0cb82c4 100644
--- a/lava_helper/lava_helper_configs.py
+++ b/lava_helper/lava_helper_configs.py
@@ -53,8 +53,8 @@
'name': 'secure_regression_suite',
'start': 'Execute test suites for the Secure area',
'end': 'End of Secure test suites',
- 'pattern': r"TEST: (?P<test_case_id>.+?) - (?P<result>(PASSED|FAILED|SKIPPED))",
- 'fixup': {"pass": "PASSED", "fail": "FAILED", "skip": "SKIPPED"},
+ 'pattern': r"'(?P<test_case_id>TFM_S_[A-Z]+_TEST_[0-9]+)'.*?(?P<result>PASSED|FAILED|SKIPPED|Assertion failed)",
+ 'fixup': {"pass": "PASSED", "fail": "FAILED", "assertion_fail": "Assertion failed", "skip": "SKIPPED"},
}
ns_reg_tests_monitors_cfg = {