From 2ae91b9ffe8bbad7c1e3389d3aaaf8c330178f54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Wed, 11 Nov 2020 20:28:26 +0100 Subject: [PATCH] Try to fix addon suppressions tests --- addons/test/misra/suppressions.txt | 14 +++++++------- addons/test/test-misra.py | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/test/misra/suppressions.txt b/addons/test/misra/suppressions.txt index acac96847..a81b6b661 100644 --- a/addons/test/misra/suppressions.txt +++ b/addons/test/misra/suppressions.txt @@ -1,7 +1,7 @@ -misra_21.6:misra-suppressions1-test.c:7 -misra_14_4 -misra.5.2 -MISRA_16_4:misra-suppressions1-test.c -MISRA.16.6:misra-suppressions1-test.c -MISRA_4_1:misra-suppressions2-test.c -MISRA.19_2:misra-suppressions2-test.c +misra-c2012-21.6:*/misra-suppressions1-test.c:7 +misra-c2012-14.4 +misra-c2012-5.2 +misra-c2012-16.4:*/misra-suppressions1-test.c +misra-c2012-16.6:*/misra-suppressions1-test.c +misra-c2012-4.1:*/misra-suppressions2-test.c +misra-c2012-19.2:*/misra-suppressions2-test.c diff --git a/addons/test/test-misra.py b/addons/test/test-misra.py index 305a22a45..a4d01b36e 100644 --- a/addons/test/test-misra.py +++ b/addons/test/test-misra.py @@ -117,7 +117,7 @@ def test_rules_suppression(checker, capsys): checker.parseDump(src + ".dump") captured = capsys.readouterr().err found = re.search(re_suppressed, captured) - assert(found is None) + assert found is None, 'Unexptected output:\n' + captured dump_remove(src)