Commit-ID:  166989e366ffa66108b2f37b870e66b85b2185ad
Gitweb:     http://git.kernel.org/tip/166989e366ffa66108b2f37b870e66b85b2185ad
Author:     Maarten Lankhorst <maarten.lankho...@canonical.com>
AuthorDate: Thu, 20 Jun 2013 13:31:51 +0200
Committer:  Ingo Molnar <mi...@kernel.org>
CommitDate: Wed, 26 Jun 2013 12:10:59 +0200

locking-selftests: Handle unexpected failures more strictly

When CONFIG_PROVE_LOCKING is not enabled, more tests are
expected to pass unexpectedly, but there no tests that should
start to fail that pass with CONFIG_PROVE_LOCKING enabled.

Signed-off-by: Maarten Lankhorst <maarten.lankho...@canonical.com>
Acked-by: Peter Zijlstra <a.p.zijls...@chello.nl>
Cc: dri-de...@lists.freedesktop.org
Cc: linaro-mm-...@lists.linaro.org
Cc: rost...@goodmis.org
Cc: dan...@ffwll.ch
Cc: Linus Torvalds <torva...@linux-foundation.org>
Cc: Andrew Morton <a...@linux-foundation.org>
Cc: Thomas Gleixner <t...@linutronix.de>
Link: http://lkml.kernel.org/r/20130620113151.4001.77963.stgit@patser
Signed-off-by: Ingo Molnar <mi...@kernel.org>
---
 lib/locking-selftest.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/locking-selftest.c b/lib/locking-selftest.c
index d554f3f..aad024d 100644
--- a/lib/locking-selftest.c
+++ b/lib/locking-selftest.c
@@ -976,16 +976,18 @@ static void dotest(void (*testcase_fn)(void), int 
expected, int lockclass_mask)
        /*
         * Filter out expected failures:
         */
-       if (debug_locks != expected) {
 #ifndef CONFIG_PROVE_LOCKING
+       if (expected == FAILURE && debug_locks) {
                expected_testcase_failures++;
                printk("failed|");
-#else
+       }
+       else
+#endif
+       if (debug_locks != expected) {
                unexpected_testcase_failures++;
                printk("FAILED|");
 
                dump_stack();
-#endif
        } else {
                testcase_successes++;
                printk("  ok  |");
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to