NTB: ntb_test: Fix bug when counting remote files
authorLogan Gunthorpe <logang@deltatee.com>
Wed, 9 Jan 2019 19:22:33 +0000 (12:22 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Jun 2020 13:33:04 +0000 (15:33 +0200)
[ Upstream commit 2130c0ba69d69bb21f5c52787f2587db00d13d8a ]

When remote files are counted in get_files_count, without using SSH,
the code returns 0 because there is a colon prepended to $LOC. $VPATH
should have been used instead of $LOC.

Fixes: 06bd0407d06c ("NTB: ntb_test: Update ntb_tool Scratchpad tests")
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Acked-by: Allen Hubbe <allenbh@gmail.com>
Tested-by: Alexander Fomichev <fomichev.ru@gmail.com>
Signed-off-by: Jon Mason <jdmason@kudzu.us>
Signed-off-by: Sasha Levin <sashal@kernel.org>
tools/testing/selftests/ntb/ntb_test.sh

index 08cbfbbc702910e088068ae710713ac2558b70a3..17ca36403d04ca5e199d8202c10708ce71d5a3b4 100755 (executable)
@@ -250,7 +250,7 @@ function get_files_count()
        split_remote $LOC
 
        if [[ "$REMOTE" == "" ]]; then
-               echo $(ls -1 "$LOC"/${NAME}* 2>/dev/null | wc -l)
+               echo $(ls -1 "$VPATH"/${NAME}* 2>/dev/null | wc -l)
        else
                echo $(ssh "$REMOTE" "ls -1 \"$VPATH\"/${NAME}* | \
                       wc -l" 2> /dev/null)