Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ecb8e94 authored by Bart Van Assche's avatar Bart Van Assche Committed by Ingo Molnar
Browse files

tools/lib/lockdep/tests: Improve testing accuracy 



Instead of checking whether the tests produced any output, check the
output itself. This patch avoids that e.g. debug output causes the
message "PASSED!" to be reported for failed tests.

Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sasha Levin <sasha.levin@oracle.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Waiman Long <longman@redhat.com>
Cc: johannes.berg@intel.com
Cc: tj@kernel.org
Link: https://lkml.kernel.org/r/20181207011148.251812-4-bvanassche@acm.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 7e979887

tools/lib/lockdep/run_tests.sh

+3 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ find tests -name '*.c' | sort | while read -r i; do 
	testname=$(basename "$i" .c)

	echo -ne "$testname... "

	if gcc -o "tests/$testname" -pthread "$i" liblockdep.a -Iinclude -D__USE_LIBLOCKDEP &&

		[ "$(timeout 1 "./tests/$testname" 2>&1 | wc -l)" -gt 0 ]; then

		timeout 1 "tests/$testname" 2>&1 | "tests/${testname}.sh"; then

		echo "PASSED!"

	else

		echo "FAILED!"
@@ -23,7 +23,8 @@ find tests -name '*.c' | sort | while read -r i; do 
	testname=$(basename "$i" .c)

	echo -ne "(PRELOAD) $testname... "

	if gcc -o "tests/$testname" -pthread -Iinclude "$i" &&

		[ "$(timeout 1 ./lockdep "./tests/$testname" 2>&1 | wc -l)" -gt 0 ]; then

		timeout 1 ./lockdep "tests/$testname" 2>&1 |

		"tests/${testname}.sh"; then

		echo "PASSED!"

	else

		echo "FAILED!"

tools/lib/lockdep/tests/AA.sh

0 → 100644
+2 −0
Original line number Diff line number Diff line 
#!/bin/bash

grep -q 'WARNING: possible recursive locking detected'

tools/lib/lockdep/tests/ABA.sh

0 → 100644
+2 −0
Original line number Diff line number Diff line 
#!/bin/bash

grep -q 'WARNING: possible recursive locking detected'

tools/lib/lockdep/tests/ABBA.sh

0 → 100644
+2 −0
Original line number Diff line number Diff line 
#!/bin/bash

grep -q 'WARNING: possible circular locking dependency detected'

tools/lib/lockdep/tests/ABBA_2threads.sh

0 → 100644
+2 −0
Original line number Diff line number Diff line 
#!/bin/bash

grep -q 'WARNING: possible circular locking dependency detected'