From 9c9b79faed0ab2addf465c63312a02fe4f960669 Mon Sep 17 00:00:00 2001
From: Christian Boltz <gitlab2@cboltz.de>
Date: Tue, 6 Nov 2018 21:14:40 +0000
Subject: [PATCH] Merge branch 'cboltz-strict-todo-check' into 'master'

error out on superfluous TODOs

See merge request apparmor/apparmor!197

Acked-by: John Johansen <john.johansen@canonical.com>

(cherry picked from commit 39a20314878cffaf4b681bb0a97672f7c6333587)

4b26850e error out on superfluous TODOs
---
 parser/tst/simple.pl | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/parser/tst/simple.pl b/parser/tst/simple.pl
index 56fac6ae9..6c48309ca 100755
--- a/parser/tst/simple.pl
+++ b/parser/tst/simple.pl
@@ -131,9 +131,13 @@ sub test_profile {
   } elsif ($coredump) {
     ok(0, "$profile: Produced core dump (signal $signal): $description");
   } elsif ($istodo) {
-    TODO: {
-      local $TODO = "Unfixed testcase.";
-      ok($expass ? !$result : $result, "TODO: $profile: $description");
+    if ($expass != $result) {
+        fail("TODO passed unexpectedly: $profile: $description");
+    } else {
+      TODO: {
+        local $TODO = "Unfixed testcase.";
+        ok($expass ? !$result : $result, "TODO: $profile: $description");
+      }
     }
   } else {
     ok($expass ? !$result : $result, "$profile: $description");