From a82301d5f2cb3a5b6269e46f36e51d17da825a6a Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 8 Jun 2022 14:55:28 +0200 Subject: [PATCH] testprogs: Fix shellcheck errors in common_test_fns.inc MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit common_test_fns.inc:13:64: error: Double quote array expansions to avoid re-splitting elements. [SC2068] common_test_fns.inc:32:64: error: Double quote array expansions to avoid re-splitting elements. [SC2068] common_test_fns.inc:53:64: error: Double quote array expansions to avoid re-splitting elements. [SC2068] common_test_fns.inc:80:64: error: Double quote array expansions to avoid re-splitting elements. [SC2068] common_test_fns.inc:106:61: error: Double quote array expansions to avoid re-splitting elements. [SC2068] common_test_fns.inc:110:32: error: Double quote array expansions to avoid re-splitting elements. [SC2068] Signed-off-by: Andreas Schneider Reviewed-by: Pavel Filipenský --- testprogs/blackbox/common_test_fns.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/testprogs/blackbox/common_test_fns.inc b/testprogs/blackbox/common_test_fns.inc index a25313054c0..68465e1e61a 100755 --- a/testprogs/blackbox/common_test_fns.inc +++ b/testprogs/blackbox/common_test_fns.inc @@ -10,7 +10,7 @@ test_smbclient() shift shift subunit_start_test "$name" - output=$($VALGRIND $smbclient $CONFIGURATION "$unc" -c "$cmd" $@ 2>&1) + output=$($VALGRIND $smbclient $CONFIGURATION "$unc" -c "$cmd" "$@" 2>&1) status=$? if [ x$status = x0 ]; then subunit_pass_test "$name" @@ -29,7 +29,7 @@ test_smbclient_expect_failure() shift shift subunit_start_test "$name" - output=$($VALGRIND $smbclient $CONFIGURATION "$unc" -c "$cmd" $@ 2>&1) + output=$($VALGRIND $smbclient $CONFIGURATION "$unc" -c "$cmd" "$@" 2>&1) status=$? if [ x$status = x0 ]; then printf '%s' "$output" | subunit_fail_test "$name" @@ -50,7 +50,7 @@ test_rpcclient_grep() shift shift subunit_start_test "$name" - output=$($VALGRIND $rpcclient $CONFIGURATION "$srv" -c "$cmd" $@ 2>&1) + output=$($VALGRIND $rpcclient $CONFIGURATION "$srv" -c "$cmd" "$@" 2>&1) status=$? if [ x$status != x0 ]; then printf '%s' "$output" | subunit_fail_test "$name" @@ -77,7 +77,7 @@ test_rpcclient_expect_failure_grep() shift shift subunit_start_test "$name" - output=$($VALGRIND $rpcclient $CONFIGURATION "$srv" -c "$cmd" $@ 2>&1) + output=$($VALGRIND $rpcclient $CONFIGURATION "$srv" -c "$cmd" "$@" 2>&1) status=$? if [ x$status = x0 ]; then printf '%s' "$output" | subunit_fail_test "$name" @@ -103,11 +103,11 @@ kerberos_kinit() if [ "${kbase}" = "samba4kinit" ]; then kpassfile=$(mktemp) echo $password >${kpassfile} - $kinit_tool -c ${KRB5CCNAME} --password-file=${kpassfile} $@ $principal + $kinit_tool -c ${KRB5CCNAME} --password-file=${kpassfile} "$@" $principal status=$? rm -f ${kpassfile} else - echo $password | $kinit_tool $@ $principal + echo $password | $kinit_tool "$@" $principal status=$? fi return $status -- 2.47.3