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

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

lockdep/lib/tests: Fix run_tests.sh 



Apparently the execute bits were set for the tests/*.sh scripts on my
test setup but these are not set in the kernel tree. Fix this by adding
the interpreter path in front of the script paths.

Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Waiman Long <longman@redhat.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: johannes.berg@intel.com
Cc: tj@kernel.org
Fixes: 5ecb8e94 ("tools/lib/lockdep/tests: Improve testing accuracy") # v5.0-rc1
Link: https://lkml.kernel.org/r/20190214230058.196511-23-bvanassche@acm.org


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

tools/lib/lockdep/run_tests.sh

+3 −3
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 | "tests/${testname}.sh"; then

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

		echo "PASSED!"

	else

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

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

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

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

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

		echo "PASSED!"

	else

		echo "FAILED!"
@@ -37,7 +37,7 @@ find tests -name '*.c' | sort | while read -r i; do 
	echo -ne "(PRELOAD + Valgrind) $testname... "

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

		{ timeout 10 valgrind --read-var-info=yes ./lockdep "./tests/$testname" >& "tests/${testname}.vg.out"; true; } &&

		"tests/${testname}.sh" < "tests/${testname}.vg.out" &&

		/bin/bash "tests/${testname}.sh" < "tests/${testname}.vg.out" &&

		! grep -Eq '(^==[0-9]*== (Invalid |Uninitialised ))|Mismatched free|Source and destination overlap| UME ' "tests/${testname}.vg.out"; then

		echo "PASSED!"

	else