Commit e79027c0 authored Jan 30, 2024 by David Ahern Committed by Jakub Kicinski Jan 31, 2024

selftests: Declare local variable for pause in fcnal-test.sh



Running fcnal-test.sh script with -P argument is causing test failures:

  $ ./fcnal-test.sh -t ping -P
  TEST: ping out - ns-B IP                                       [ OK ]

  hit enter to continue, 'q' to quit

  fcnal-test.sh: line 106: [: ping: integer expression expected
  TEST: out,                                                     [FAIL]
      expected rc ping; actual rc 0

  hit enter to continue, 'q' to quit

The test functions use local variable 'a' for addresses and
then log_test is also using 'a' without a local declaration.
Fix by declaring a local variable and using 'ans' (for answer)
in the read.

Signed-off-by: David Ahern <dsahern@kernel.org>
Link: https://lore.kernel.org/r/20240130154327.33848-1-dsahern@kernel.org


Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parent 567058d3

tools/testing/selftests/net/fcnal-test.sh

+5 −4

Original line number	Diff line number	Diff line
		@@ -100,6 +100,7 @@ log_test()
		local rc=$1
		local expected=$2
		local msg="$3"
		local ans

		[ "${VERBOSE}" = "1" ] && echo

		@@ -113,16 +114,16 @@ log_test()
		if [ "${PAUSE_ON_FAIL}" = "yes" ]; then
		echo
		echo "hit enter to continue, 'q' to quit"
		read a
		[ "$a" = "q" ] && exit 1
		read ans
		[ "$ans" = "q" ] && exit 1
		fi
		fi

		if [ "${PAUSE}" = "yes" ]; then
		echo
		echo "hit enter to continue, 'q' to quit"
		read a
		[ "$a" = "q" ] && exit 1
		read ans
		[ "$ans" = "q" ] && exit 1
		fi

		kill_procs