1 files changed, 27 insertions, 12 deletions

diff --git a/tools/lib/lockdep/run_tests.sh b/tools/lib/lockdep/run_tests.sh
index 2e570a188f16..c8fbd0306960 100755
--- a/tools/lib/lockdep/run_tests.sh
+++ b/tools/lib/lockdep/run_tests.sh
@@ -1,32 +1,47 @@
 #! /bin/bash
 # SPDX-License-Identifier: GPL-2.0
 
-make &> /dev/null
+if ! make >/dev/null; then
+    echo "Building liblockdep failed."
+    echo "FAILED!"
+    exit 1
+fi
 
-for i in `ls tests/*.c`; do
+find tests -name '*.c' | sort | while read -r i; do
         testname=$(basename "$i" .c)
-        gcc -o tests/$testname -pthread $i liblockdep.a -Iinclude -D__USE_LIBLOCKDEP &> /dev/null
         echo -ne "$testname... "
-        if [ $(timeout 1 ./tests/$testname 2>&1 | wc -l) -gt 0 ]; then
+        if gcc -o "tests/$testname" -pthread "$i" liblockdep.a -Iinclude -D__USE_LIBLOCKDEP &&
+                timeout 1 "tests/$testname" 2>&1 | "tests/${testname}.sh"; then
                 echo "PASSED!"
         else
                 echo "FAILED!"
         fi
-        if [ -f "tests/$testname" ]; then
-                rm tests/$testname
-        fi
+        rm -f "tests/$testname"
 done
 
-for i in `ls tests/*.c`; do
+find tests -name '*.c' | sort | while read -r i; do
         testname=$(basename "$i" .c)
-        gcc -o tests/$testname -pthread -Iinclude $i &> /dev/null
         echo -ne "(PRELOAD) $testname... "
-        if [ $(timeout 1 ./lockdep ./tests/$testname 2>&1 | wc -l) -gt 0 ]; then
+        if gcc -o "tests/$testname" -pthread -Iinclude "$i" &&
+                timeout 1 ./lockdep "tests/$testname" 2>&1 |
+                "tests/${testname}.sh"; then
                 echo "PASSED!"
         else
                 echo "FAILED!"
         fi
-        if [ -f "tests/$testname" ]; then
-                rm tests/$testname
+        rm -f "tests/$testname"
+done
+
+find tests -name '*.c' | sort | while read -r i; do
+        testname=$(basename "$i" .c)
+        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" &&
+                ! grep -Eq '(^==[0-9]*== (Invalid |Uninitialised ))|Mismatched free|Source and destination overlap| UME ' "tests/${testname}.vg.out"; then
+                echo "PASSED!"
+        else
+                echo "FAILED!"
         fi
+        rm -f "tests/$testname"
 done