summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaarten Lankhorst <maarten.lankhorst@canonical.com>2013-06-20 13:31:51 +0200
committerIngo Molnar <mingo@kernel.org>2013-06-26 12:10:59 +0200
commit166989e366ffa66108b2f37b870e66b85b2185ad (patch)
tree1973b0dc9dd2eb10b35d541fffca643d210ae3d2
parentf3cf139efa4bc0fe4f032af6ca3e49e38a5d9ae5 (diff)
downloadkernel-common-166989e366ffa66108b2f37b870e66b85b2185ad.tar.gz
kernel-common-166989e366ffa66108b2f37b870e66b85b2185ad.tar.bz2
kernel-common-166989e366ffa66108b2f37b870e66b85b2185ad.zip
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.lankhorst@canonical.com> Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: dri-devel@lists.freedesktop.org Cc: linaro-mm-sig@lists.linaro.org Cc: rostedt@goodmis.org Cc: daniel@ffwll.ch Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/20130620113151.4001.77963.stgit@patser Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--lib/locking-selftest.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/locking-selftest.c b/lib/locking-selftest.c
index d554f3fed846..aad024dde3c4 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 |");