Commit ad67536d authored Jan 09, 2019 by Logan Gunthorpe Committed by Greg Kroah-Hartman Jun 24, 2020

NTB: ntb_test: Fix bug when counting remote files



[ 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: 06bd0407 ("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>

parent abf91823

tools/testing/selftests/ntb/ntb_test.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -241,7 +241,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)