lkml.org 
[lkml]   [2018]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.14 18/84] test_firmware: fix setting old custom fw path back on exit
    Date
    From: "Luis R. Rodriguez" <mcgrof@kernel.org>

    [ Upstream commit 65c79230576873b312c3599479c1e42355c9f349 ]

    The file /sys/module/firmware_class/parameters/path can be used
    to set a custom firmware path. The fw_filesystem.sh script creates
    a temporary directory to add a test firmware file to be used during
    testing, in order for this to work it uses the custom path syfs file
    and it was supposed to reset back the file on execution exit. The
    script failed to do this due to a typo, it was using OLD_PATH instead
    of OLD_FWPATH, since its inception since v3.17.

    Its not as easy to just keep the old setting, it turns out that
    resetting an empty setting won't actually do what we want, we need
    to check if it was empty and set an empty space.

    Without this we end up having the temporary path always set after
    we run these tests.

    Fixes: 0a8adf58475 ("test: add firmware_class loader test")
    Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    tools/testing/selftests/firmware/fw_filesystem.sh | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/tools/testing/selftests/firmware/fw_filesystem.sh b/tools/testing/selftests/firmware/fw_filesystem.sh
    index 62f2d6f54929..13ade39fe832 100755
    --- a/tools/testing/selftests/firmware/fw_filesystem.sh
    +++ b/tools/testing/selftests/firmware/fw_filesystem.sh
    @@ -45,7 +45,10 @@ test_finish()
    if [ "$HAS_FW_LOADER_USER_HELPER" = "yes" ]; then
    echo "$OLD_TIMEOUT" >/sys/class/firmware/timeout
    fi
    - echo -n "$OLD_PATH" >/sys/module/firmware_class/parameters/path
    + if [ "$OLD_FWPATH" = "" ]; then
    + OLD_FWPATH=" "
    + fi
    + echo -n "$OLD_FWPATH" >/sys/module/firmware_class/parameters/path
    rm -f "$FW"
    rmdir "$FWPATH"
    }
    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-03 23:29    [W:4.089 / U:0.204 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site