lkml.org 
[lkml]   [2017]   [Nov]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 14/23] test_firmware: wrap basic sysfs fallback tests into helper
    Date
    These cannot run on all kernel builds. This will help us later
    skip this test on kernel configs where non-applicable.

    Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
    ---
    tools/testing/selftests/firmware/fw_fallback.sh | 78 +++++++++++++------------
    1 file changed, 41 insertions(+), 37 deletions(-)

    diff --git a/tools/testing/selftests/firmware/fw_fallback.sh b/tools/testing/selftests/firmware/fw_fallback.sh
    index e364631837d6..0d4527c5e8a4 100755
    --- a/tools/testing/selftests/firmware/fw_fallback.sh
    +++ b/tools/testing/selftests/firmware/fw_fallback.sh
    @@ -212,37 +212,51 @@ test_syfs_timeout()
    fi
    }

    -test_syfs_timeout
    +run_sysfs_main_tests()
    +{
    + test_syfs_timeout
    + # Put timeout high enough for us to do work but not so long that failures
    + # slow down this test too much.
    + echo 4 >/sys/class/firmware/timeout

    -# Put timeout high enough for us to do work but not so long that failures
    -# slow down this test too much.
    -echo 4 >/sys/class/firmware/timeout
    + # Load this script instead of the desired firmware.
    + load_fw "$NAME" "$0"
    + if diff -q "$FW" /dev/test_firmware >/dev/null ; then
    + echo "$0: firmware was not expected to match" >&2
    + exit 1
    + else
    + echo "$0: firmware comparison works"
    + fi

    -# Load this script instead of the desired firmware.
    -load_fw "$NAME" "$0"
    -if diff -q "$FW" /dev/test_firmware >/dev/null ; then
    - echo "$0: firmware was not expected to match" >&2
    - exit 1
    -else
    - echo "$0: firmware comparison works"
    -fi
    + # Do a proper load, which should work correctly.
    + load_fw "$NAME" "$FW"
    + if ! diff -q "$FW" /dev/test_firmware >/dev/null ; then
    + echo "$0: firmware was not loaded" >&2
    + exit 1
    + else
    + echo "$0: fallback mechanism works"
    + fi

    -# Do a proper load, which should work correctly.
    -load_fw "$NAME" "$FW"
    -if ! diff -q "$FW" /dev/test_firmware >/dev/null ; then
    - echo "$0: firmware was not loaded" >&2
    - exit 1
    -else
    - echo "$0: fallback mechanism works"
    -fi
    + load_fw_cancel "nope-$NAME" "$FW"
    + if diff -q "$FW" /dev/test_firmware >/dev/null ; then
    + echo "$0: firmware was expected to be cancelled" >&2
    + exit 1
    + else
    + echo "$0: cancelling fallback mechanism works"
    + fi

    -load_fw_cancel "nope-$NAME" "$FW"
    -if diff -q "$FW" /dev/test_firmware >/dev/null ; then
    - echo "$0: firmware was expected to be cancelled" >&2
    - exit 1
    -else
    - echo "$0: cancelling fallback mechanism works"
    -fi
    + set +e
    + load_fw_fallback_with_child "nope-signal-$NAME" "$FW"
    + if [ "$?" -eq 0 ]; then
    + echo "$0: SIGCHLD on sync ignored as expected" >&2
    + else
    + echo "$0: error - sync firmware request cancelled due to SIGCHLD" >&2
    + exit 1
    + fi
    + set -e
    +}
    +
    +run_sysfs_main_tests

    if load_fw_custom "$NAME" "$FW" ; then
    if ! diff -q "$FW" /dev/test_firmware >/dev/null ; then
    @@ -262,14 +276,4 @@ if load_fw_custom_cancel "nope-$NAME" "$FW" ; then
    fi
    fi

    -set +e
    -load_fw_fallback_with_child "nope-signal-$NAME" "$FW"
    -if [ "$?" -eq 0 ]; then
    - echo "$0: SIGCHLD on sync ignored as expected" >&2
    -else
    - echo "$0: error - sync firmware request cancelled due to SIGCHLD" >&2
    - exit 1
    -fi
    -set -e
    -
    exit 0
    --
    2.15.0
    \
     
     \ /
      Last update: 2017-11-20 19:27    [W:6.757 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site