From df29b9ab16564ab94d451ae00ae6cd4def747b58 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 23 Feb 2022 12:02:44 +0100 Subject: [PATCH] s4:selftest: Reformat shell scripts MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit shfmt -f source4/selftest/ | xargs shfmt -w -p -i 0 -fn Signed-off-by: Andreas Schneider Reviewed-by: Pavel Filipenský --- source4/selftest/provisions/dump.sh | 47 +++++++++---------- .../release-4-5-0-pre1/add-deleted-user.sh | 10 ++-- .../release-4-5-0-pre1/simple-dc-steps.sh | 24 +++++----- source4/selftest/provisions/undump.sh | 31 ++++++------ source4/selftest/test_samba3dump.sh | 2 +- source4/selftest/test_w2k3.sh | 26 +++++----- source4/selftest/test_w2k3_file.sh | 8 ++-- source4/selftest/test_win.sh | 2 +- source4/selftest/tests_win.sh | 38 +++++++-------- source4/selftest/win/wintest_2k3_dc.sh | 44 +++++++++-------- source4/selftest/win/wintest_base.sh | 9 ++-- source4/selftest/win/wintest_client.sh | 8 ++-- source4/selftest/win/wintest_functions.sh | 8 ++-- source4/selftest/win/wintest_net.sh | 15 +++--- source4/selftest/win/wintest_raw.sh | 9 ++-- source4/selftest/win/wintest_rpc.sh | 15 +++--- 16 files changed, 152 insertions(+), 144 deletions(-) diff --git a/source4/selftest/provisions/dump.sh b/source4/selftest/provisions/dump.sh index 1b3ec1ee497..e9467e4af06 100755 --- a/source4/selftest/provisions/dump.sh +++ b/source4/selftest/provisions/dump.sh @@ -2,47 +2,46 @@ # dump a provision directory [ "$#" -gt 0 ] || { - echo "Usage: dump.sh [TARGETDIR] [TDBDUMP]" - exit 1 + echo "Usage: dump.sh [TARGETDIR] [TDBDUMP]" + exit 1 } TDBDUMP=tdbdump [ "$#" -lt 3 ] || { - TDBDUMP=$3 + TDBDUMP=$3 } - dirbase="$1" -TARGETDIR=`pwd`/$dirbase +TARGETDIR=$(pwd)/$dirbase cd $dirbase [ "$#" -lt 2 ] || { - TARGETDIR=$2 + TARGETDIR=$2 } for f in $(find . -name '*.tdb'); do - dname=$TARGETDIR/$(dirname $f) - mkdir -p $dname - outname=$dname/$(basename $f).dump - echo "Dumping $f to $outname" - $TDBDUMP $f > $outname || { - echo "Failed to dump to $outname" - exit 1 - } - rm -f $f + dname=$TARGETDIR/$(dirname $f) + mkdir -p $dname + outname=$dname/$(basename $f).dump + echo "Dumping $f to $outname" + $TDBDUMP $f >$outname || { + echo "Failed to dump to $outname" + exit 1 + } + rm -f $f done for f in $(find . -name '*.ldb'); do - dname=$TARGETDIR/$(dirname $f) - mkdir -p $dname - outname=$dname/$(basename $f).dump - echo "Dumping $f to $outname" - $TDBDUMP $f > $outname || { - echo "Failed to dump to $outname" - exit 1 - } - rm -f $f + dname=$TARGETDIR/$(dirname $f) + mkdir -p $dname + outname=$dname/$(basename $f).dump + echo "Dumping $f to $outname" + $TDBDUMP $f >$outname || { + echo "Failed to dump to $outname" + exit 1 + } + rm -f $f done exit 0 diff --git a/source4/selftest/provisions/release-4-5-0-pre1/add-deleted-user.sh b/source4/selftest/provisions/release-4-5-0-pre1/add-deleted-user.sh index efee4cee718..dfe932b03a3 100755 --- a/source4/selftest/provisions/release-4-5-0-pre1/add-deleted-user.sh +++ b/source4/selftest/provisions/release-4-5-0-pre1/add-deleted-user.sh @@ -7,13 +7,13 @@ SAMBA_TOOL=$(pwd)/bin/samba-tool #make test TESTS="samba4.blackbox.group.py" -$SAMBA_TOOL user add -H $DB fred complexpassword#12 +$SAMBA_TOOL user add -H $DB fred complexpassword#12 $SAMBA_TOOL group add -H $DB swimmers $SAMBA_TOOL group addmembers -H $DB swimmers fred $SAMBA_TOOL user delete -H $DB fred -bin/ldbsearch -H $DB --show-recycled --show-deleted \ - --show-deactivated-link --reveal | grep fred -bin/ldbsearch -H $DB --show-recycled --show-deleted \ - --show-deactivated-link --reveal | grep swimmers +bin/ldbsearch -H $DB --show-recycled --show-deleted \ + --show-deactivated-link --reveal | grep fred +bin/ldbsearch -H $DB --show-recycled --show-deleted \ + --show-deactivated-link --reveal | grep swimmers diff --git a/source4/selftest/provisions/release-4-5-0-pre1/simple-dc-steps.sh b/source4/selftest/provisions/release-4-5-0-pre1/simple-dc-steps.sh index 4d36b06d2d5..8b87da22d12 100755 --- a/source4/selftest/provisions/release-4-5-0-pre1/simple-dc-steps.sh +++ b/source4/selftest/provisions/release-4-5-0-pre1/simple-dc-steps.sh @@ -5,30 +5,30 @@ make test TESTS="samba4.blackbox.group.py" echo adding user fred -bin/samba-tool user add -H st/provision/simple-dc/private/sam.ldb fred complexpassword#12 +bin/samba-tool user add -H st/provision/simple-dc/private/sam.ldb fred complexpassword#12 echo adding group swimmers -bin/samba-tool group add -H st/provision/simple-dc/private/sam.ldb swimmers +bin/samba-tool group add -H st/provision/simple-dc/private/sam.ldb swimmers echo adding fred to swimmers -bin/samba-tool group addmembers -H st/provision/simple-dc/private/sam.ldb swimmers fred +bin/samba-tool group addmembers -H st/provision/simple-dc/private/sam.ldb swimmers fred echo for w in swimmers fred; do - echo grepping for $w - echo ------------------------------------ - bin/ldbsearch -H st/provision/simple-dc/private/sam.ldb --show-recycled --show-deleted --show-deactivated-link --reveal | grep $w - echo ------------------------------------ + echo grepping for $w + echo ------------------------------------ + bin/ldbsearch -H st/provision/simple-dc/private/sam.ldb --show-recycled --show-deleted --show-deactivated-link --reveal | grep $w + echo ------------------------------------ done echo echo deleting fred -bin/samba-tool user delete -H st/provision/simple-dc/private/sam.ldb fred +bin/samba-tool user delete -H st/provision/simple-dc/private/sam.ldb fred for w in swimmers fred; do - echo grepping for $w - echo ------------------------------------ - bin/ldbsearch -H st/provision/simple-dc/private/sam.ldb --show-recycled --show-deleted --show-deactivated-link --reveal | grep $w - echo ------------------------------------ + echo grepping for $w + echo ------------------------------------ + bin/ldbsearch -H st/provision/simple-dc/private/sam.ldb --show-recycled --show-deleted --show-deactivated-link --reveal | grep $w + echo ------------------------------------ done echo diff --git a/source4/selftest/provisions/undump.sh b/source4/selftest/provisions/undump.sh index 7ffea3eff70..b1ad933202b 100755 --- a/source4/selftest/provisions/undump.sh +++ b/source4/selftest/provisions/undump.sh @@ -2,36 +2,35 @@ # undump a provision directory [ "$#" -gt 0 ] || { - echo "Usage: undump.sh [TARGETDIR] [TDBRESTORE]" - exit 1 + echo "Usage: undump.sh [TARGETDIR] [TDBRESTORE]" + exit 1 } TDBRESTORE=tdbrestore [ "$#" -lt 3 ] || { - TDBRESTORE=$3 + TDBRESTORE=$3 } - dirbase="$1" -TARGETDIR=`pwd`/$dirbase +TARGETDIR=$(pwd)/$dirbase cd $dirbase [ "$#" -lt 2 ] || { - TARGETDIR=$2 + TARGETDIR=$2 } for f in $(find . -name '*.dump'); do - dname=$TARGETDIR/$(dirname $f) - mkdir -p $dname - bname=$(basename $f .dump) - outname=$dname/$bname - echo "Restoring $outname" - rm -f $outname - $TDBRESTORE $outname < $f || { - echo "Failed to restore $outname" - exit 1 - } + dname=$TARGETDIR/$(dirname $f) + mkdir -p $dname + bname=$(basename $f .dump) + outname=$dname/$bname + echo "Restoring $outname" + rm -f $outname + $TDBRESTORE $outname <$f || { + echo "Failed to restore $outname" + exit 1 + } done exit 0 diff --git a/source4/selftest/test_samba3dump.sh b/source4/selftest/test_samba3dump.sh index 6cde2bd07e6..f8dc850c6c8 100755 --- a/source4/selftest/test_samba3dump.sh +++ b/source4/selftest/test_samba3dump.sh @@ -5,7 +5,7 @@ subunit_start_test samba3dump -SRCDIR=`dirname $0`/../.. +SRCDIR=$(dirname $0)/../.. if $PYTHON $SRCDIR/source4/scripting/bin/samba3dump $SRCDIR/testdata/samba3; then subunit_pass_test samba3dump diff --git a/source4/selftest/test_w2k3.sh b/source4/selftest/test_w2k3.sh index 3cd034d0003..20d4e5dbe78 100755 --- a/source4/selftest/test_w2k3.sh +++ b/source4/selftest/test_w2k3.sh @@ -8,10 +8,10 @@ ncacn_np_tests="RPC-SCHANNEL RPC-DSSETUP RPC-EPMAPPER RPC-SAMR RPC-WKSSVC RPC-SR ncacn_ip_tcp_tests="RPC-SCHANNEL RPC-EPMAPPER RPC-SAMR RPC-NETLOGON RPC-LSA RPC-SAMLOGON RPC-SAMSYNC RPC-MULTIBIND" if [ $# -lt 4 ]; then -cat < EOF -exit 1; + exit 1 fi unc="$1" @@ -16,7 +16,7 @@ start="$4" shift 4 ADDARGS="$*" -incdir=`dirname $0` +incdir=$(dirname $0) . $incdir/test_functions.sh tests="BASE-FDPASS BASE-LOCK " @@ -40,5 +40,5 @@ fail="RAW-SEARCH RAW-ACLS RAW-QFSINFO" echo "Skipping tests expected to fail: $fail" for t in $tests; do - testit "$t" smb $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t + testit "$t" smb $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t done diff --git a/source4/selftest/test_win.sh b/source4/selftest/test_win.sh index 17c09e6b269..bf6d2e18a3b 100755 --- a/source4/selftest/test_win.sh +++ b/source4/selftest/test_win.sh @@ -9,7 +9,7 @@ . selftest/test_functions.sh -export SMBTORTURE_REMOTE_HOST=`perl -I$WINTEST_DIR $WINTEST_DIR/vm_get_ip.pl VM_CFG_PATH` +export SMBTORTURE_REMOTE_HOST=$(perl -I$WINTEST_DIR $WINTEST_DIR/vm_get_ip.pl VM_CFG_PATH) if [ -z $SMBTORTURE_REMOTE_HOST ]; then # Restore snapshot to ensure VM is in a known state, then exit. restore_snapshot "Test failed to get the IP address of the windows host." "$VM_CFG_PATH" diff --git a/source4/selftest/tests_win.sh b/source4/selftest/tests_win.sh index 19460eee0ed..fafaef1f5a5 100755 --- a/source4/selftest/tests_win.sh +++ b/source4/selftest/tests_win.sh @@ -1,30 +1,30 @@ #!/bin/sh - if [ `whoami` != "root" ]; then - echo "Windows tests will not run without root privileges." - exit 1 - fi +if [ $(whoami) != "root" ]; then + echo "Windows tests will not run without root privileges." + exit 1 +fi - if [ "$DO_SOCKET_WRAPPER" = SOCKET_WRAPPER ]; then - echo "Windows tests will not run with socket wrapper enabled." - exit 1 - fi +if [ "$DO_SOCKET_WRAPPER" = SOCKET_WRAPPER ]; then + echo "Windows tests will not run with socket wrapper enabled." + exit 1 +fi - if [ ! $WINTESTCONF ]; then +if [ ! $WINTESTCONF ]; then echo "Environment variable WINTESTCONF has not been defined." echo "Windows tests will not run unconfigured." exit 1 - fi +fi - if [ ! -r $WINTESTCONF ]; then - echo "$WINTESTCONF could not be read." - exit 1 - fi +if [ ! -r $WINTESTCONF ]; then + echo "$WINTESTCONF could not be read." + exit 1 +fi - export WINTEST_DIR=$SRCDIR/selftest/win - export TMPDIR=$TMPDIR - export NETBIOSNAME=$NETBIOSNAME +export WINTEST_DIR=$SRCDIR/selftest/win +export TMPDIR=$TMPDIR +export NETBIOSNAME=$NETBIOSNAME - . $WINTESTCONF +. $WINTESTCONF - $SRCDIR/selftest/test_win.sh +$SRCDIR/selftest/test_win.sh diff --git a/source4/selftest/win/wintest_2k3_dc.sh b/source4/selftest/win/wintest_2k3_dc.sh index ed964a274af..4852e22a01c 100755 --- a/source4/selftest/win/wintest_2k3_dc.sh +++ b/source4/selftest/win/wintest_2k3_dc.sh @@ -1,34 +1,34 @@ #!/bin/sh if [ $# -lt 1 ]; then -cat < $TMPDIR/client_test.exp -cat $WINTEST_DIR/wintest_client.exp >> $TMPDIR/client_test.exp +cat $WINTEST_DIR/common.exp >$TMPDIR/client_test.exp +cat $WINTEST_DIR/wintest_client.exp >>$TMPDIR/client_test.exp -expect $TMPDIR/client_test.exp || all_errs=`expr $all_errs + 1` +expect $TMPDIR/client_test.exp || all_errs=$(expr $all_errs + 1) -if [ $all_errs > 0 ]; then +if [ $all_errs ] >0; then # Restore snapshot to ensure VM is in a known state. restore_snapshot "\n$test_name failed." "$VM_CFG_PATH" fi diff --git a/source4/selftest/win/wintest_functions.sh b/source4/selftest/win/wintest_functions.sh index 3c0a1dccac1..9b6bed98ee4 100755 --- a/source4/selftest/win/wintest_functions.sh +++ b/source4/selftest/win/wintest_functions.sh @@ -9,8 +9,8 @@ setup_share_test() { echo -e "\nSetting up windows environment." - cat $WINTEST_DIR/common.exp > $TMPDIR/setup.exp - cat $WINTEST_DIR/wintest_setup.exp >> $TMPDIR/setup.exp + cat $WINTEST_DIR/common.exp >$TMPDIR/setup.exp + cat $WINTEST_DIR/wintest_setup.exp >>$TMPDIR/setup.exp expect $TMPDIR/setup.exp err_rtn=$? rm -f $TMPDIR/setup.exp @@ -20,8 +20,8 @@ setup_share_test() remove_share_test() { echo -e "\nCleaning up windows environment." - cat $WINTEST_DIR/common.exp > $TMPDIR/remove.exp - cat $WINTEST_DIR/wintest_remove.exp >> $TMPDIR/remove.exp + cat $WINTEST_DIR/common.exp >$TMPDIR/remove.exp + cat $WINTEST_DIR/wintest_remove.exp >>$TMPDIR/remove.exp expect $TMPDIR/remove.exp err_rtn=$? rm -f $TMPDIR/remove.exp diff --git a/source4/selftest/win/wintest_net.sh b/source4/selftest/win/wintest_net.sh index 88cec1f3a79..429be6cd792 100755 --- a/source4/selftest/win/wintest_net.sh +++ b/source4/selftest/win/wintest_net.sh @@ -8,10 +8,10 @@ . $WINTESTCONF if [ $# -lt 4 ]; then -cat <