Commit-ID:  da087b2229618f78ecea5c203fed8ba2245de636
Gitweb:     https://git.kernel.org/tip/da087b2229618f78ecea5c203fed8ba2245de636
Author:     Bart Van Assche <bvanass...@acm.org>
AuthorDate: Thu, 6 Dec 2018 17:11:25 -0800
Committer:  Ingo Molnar <mi...@kernel.org>
CommitDate: Tue, 11 Dec 2018 14:54:47 +0100

tools/lib/lockdep/tests: Display compiler warning and error messages

If compilation of liblockdep fails, display an error message and exit
immediately. Display compiler warning and error messages that are
generated while building a test. Only run a test if compilation of it
succeeded.

Signed-off-by: Bart Van Assche <bvanass...@acm.org>
Signed-off-by: Peter Zijlstra (Intel) <pet...@infradead.org>
Cc: Johannes Berg <johan...@sipsolutions.net>
Cc: Linus Torvalds <torva...@linux-foundation.org>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Sasha Levin <sasha.le...@oracle.com>
Cc: Thomas Gleixner <t...@linutronix.de>
Cc: Waiman Long <long...@redhat.com>
Cc: johannes.b...@intel.com
Cc: t...@kernel.org
Link: https://lkml.kernel.org/r/20181207011148.251812-2-bvanass...@acm.org
Signed-off-by: Ingo Molnar <mi...@kernel.org>
---
 tools/lib/lockdep/run_tests.sh | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/tools/lib/lockdep/run_tests.sh b/tools/lib/lockdep/run_tests.sh
index 2e570a188f16..9f31f84e7fac 100755
--- a/tools/lib/lockdep/run_tests.sh
+++ b/tools/lib/lockdep/run_tests.sh
@@ -1,13 +1,17 @@
 #! /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
        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 | wc -l)" -gt 0 ]; then
                echo "PASSED!"
        else
                echo "FAILED!"
@@ -19,9 +23,9 @@ done
 
 for i in `ls tests/*.c`; 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 | wc -l)" -gt 
0 ]; then
                echo "PASSED!"
        else
                echo "FAILED!"

Reply via email to