lkml.org 
[lkml]   [2019]   [Mar]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.0 066/262] lockdep/lib/tests: Fix run_tests.sh
    Date
    From: Bart Van Assche <bvanassche@acm.org>

    [ Upstream commit d93ac78bf7b37db36fa00225f8e9a14c7ed1b2ba ]

    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: Bart Van Assche <bvanassche@acm.org>
    Signed-off-by: Peter 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: 5ecb8e94b494 ("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: Ingo Molnar <mingo@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/lib/lockdep/run_tests.sh | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/tools/lib/lockdep/run_tests.sh b/tools/lib/lockdep/run_tests.sh
    index c8fbd0306960..11f425662b43 100755
    --- a/tools/lib/lockdep/run_tests.sh
    +++ b/tools/lib/lockdep/run_tests.sh
    @@ -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
    --
    2.19.1
    \
     
     \ /
      Last update: 2019-03-27 20:29    [W:5.018 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site