lkml.org 
[lkml]   [2018]   [Nov]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 03/27] lockdep tests: Improve testing accuracy
    Date
    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: Bart Van Assche <bvanassche@acm.org>
    ---
    tools/lib/lockdep/run_tests.sh | 5 +++--
    tools/lib/lockdep/tests/AA.sh | 2 ++
    tools/lib/lockdep/tests/ABA.sh | 2 ++
    tools/lib/lockdep/tests/ABBA.sh | 2 ++
    tools/lib/lockdep/tests/ABBA_2threads.sh | 2 ++
    tools/lib/lockdep/tests/ABBCCA.sh | 2 ++
    tools/lib/lockdep/tests/ABBCCDDA.sh | 2 ++
    tools/lib/lockdep/tests/ABCABC.sh | 2 ++
    tools/lib/lockdep/tests/ABCDBCDA.sh | 2 ++
    tools/lib/lockdep/tests/ABCDBDDA.sh | 2 ++
    tools/lib/lockdep/tests/WW.sh | 2 ++
    tools/lib/lockdep/tests/unlock_balance.sh | 2 ++
    12 files changed, 25 insertions(+), 2 deletions(-)
    create mode 100755 tools/lib/lockdep/tests/AA.sh
    create mode 100755 tools/lib/lockdep/tests/ABA.sh
    create mode 100755 tools/lib/lockdep/tests/ABBA.sh
    create mode 100755 tools/lib/lockdep/tests/ABBA_2threads.sh
    create mode 100755 tools/lib/lockdep/tests/ABBCCA.sh
    create mode 100755 tools/lib/lockdep/tests/ABBCCDDA.sh
    create mode 100755 tools/lib/lockdep/tests/ABCABC.sh
    create mode 100755 tools/lib/lockdep/tests/ABCDBCDA.sh
    create mode 100755 tools/lib/lockdep/tests/ABCDBDDA.sh
    create mode 100755 tools/lib/lockdep/tests/WW.sh
    create mode 100755 tools/lib/lockdep/tests/unlock_balance.sh

    diff --git a/tools/lib/lockdep/run_tests.sh b/tools/lib/lockdep/run_tests.sh
    index e4f41318aa79..38b8c9034b8e 100755
    --- a/tools/lib/lockdep/run_tests.sh
    +++ b/tools/lib/lockdep/run_tests.sh
    @@ -10,7 +10,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!"
    @@ -22,7 +22,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!"
    diff --git a/tools/lib/lockdep/tests/AA.sh b/tools/lib/lockdep/tests/AA.sh
    new file mode 100755
    index 000000000000..f39b32865074
    --- /dev/null
    +++ b/tools/lib/lockdep/tests/AA.sh
    @@ -0,0 +1,2 @@
    +#!/bin/bash
    +grep -q 'WARNING: possible recursive locking detected'
    diff --git a/tools/lib/lockdep/tests/ABA.sh b/tools/lib/lockdep/tests/ABA.sh
    new file mode 100755
    index 000000000000..f39b32865074
    --- /dev/null
    +++ b/tools/lib/lockdep/tests/ABA.sh
    @@ -0,0 +1,2 @@
    +#!/bin/bash
    +grep -q 'WARNING: possible recursive locking detected'
    diff --git a/tools/lib/lockdep/tests/ABBA.sh b/tools/lib/lockdep/tests/ABBA.sh
    new file mode 100755
    index 000000000000..fc31c607a5a8
    --- /dev/null
    +++ b/tools/lib/lockdep/tests/ABBA.sh
    @@ -0,0 +1,2 @@
    +#!/bin/bash
    +grep -q 'WARNING: possible circular locking dependency detected'
    diff --git a/tools/lib/lockdep/tests/ABBA_2threads.sh b/tools/lib/lockdep/tests/ABBA_2threads.sh
    new file mode 100755
    index 000000000000..fc31c607a5a8
    --- /dev/null
    +++ b/tools/lib/lockdep/tests/ABBA_2threads.sh
    @@ -0,0 +1,2 @@
    +#!/bin/bash
    +grep -q 'WARNING: possible circular locking dependency detected'
    diff --git a/tools/lib/lockdep/tests/ABBCCA.sh b/tools/lib/lockdep/tests/ABBCCA.sh
    new file mode 100755
    index 000000000000..fc31c607a5a8
    --- /dev/null
    +++ b/tools/lib/lockdep/tests/ABBCCA.sh
    @@ -0,0 +1,2 @@
    +#!/bin/bash
    +grep -q 'WARNING: possible circular locking dependency detected'
    diff --git a/tools/lib/lockdep/tests/ABBCCDDA.sh b/tools/lib/lockdep/tests/ABBCCDDA.sh
    new file mode 100755
    index 000000000000..fc31c607a5a8
    --- /dev/null
    +++ b/tools/lib/lockdep/tests/ABBCCDDA.sh
    @@ -0,0 +1,2 @@
    +#!/bin/bash
    +grep -q 'WARNING: possible circular locking dependency detected'
    diff --git a/tools/lib/lockdep/tests/ABCABC.sh b/tools/lib/lockdep/tests/ABCABC.sh
    new file mode 100755
    index 000000000000..fc31c607a5a8
    --- /dev/null
    +++ b/tools/lib/lockdep/tests/ABCABC.sh
    @@ -0,0 +1,2 @@
    +#!/bin/bash
    +grep -q 'WARNING: possible circular locking dependency detected'
    diff --git a/tools/lib/lockdep/tests/ABCDBCDA.sh b/tools/lib/lockdep/tests/ABCDBCDA.sh
    new file mode 100755
    index 000000000000..fc31c607a5a8
    --- /dev/null
    +++ b/tools/lib/lockdep/tests/ABCDBCDA.sh
    @@ -0,0 +1,2 @@
    +#!/bin/bash
    +grep -q 'WARNING: possible circular locking dependency detected'
    diff --git a/tools/lib/lockdep/tests/ABCDBDDA.sh b/tools/lib/lockdep/tests/ABCDBDDA.sh
    new file mode 100755
    index 000000000000..fc31c607a5a8
    --- /dev/null
    +++ b/tools/lib/lockdep/tests/ABCDBDDA.sh
    @@ -0,0 +1,2 @@
    +#!/bin/bash
    +grep -q 'WARNING: possible circular locking dependency detected'
    diff --git a/tools/lib/lockdep/tests/WW.sh b/tools/lib/lockdep/tests/WW.sh
    new file mode 100755
    index 000000000000..f39b32865074
    --- /dev/null
    +++ b/tools/lib/lockdep/tests/WW.sh
    @@ -0,0 +1,2 @@
    +#!/bin/bash
    +grep -q 'WARNING: possible recursive locking detected'
    diff --git a/tools/lib/lockdep/tests/unlock_balance.sh b/tools/lib/lockdep/tests/unlock_balance.sh
    new file mode 100755
    index 000000000000..c6e3952303fe
    --- /dev/null
    +++ b/tools/lib/lockdep/tests/unlock_balance.sh
    @@ -0,0 +1,2 @@
    +#!/bin/bash
    +grep -q 'WARNING: bad unlock balance detected'
    --
    2.20.0.rc0.387.gc7a69e6b6c-goog
    \
     
     \ /
      Last update: 2018-11-29 00:45    [W:2.166 / U:0.164 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site