s4:torture: Reformat shell scripts

shfmt -f source4/torture/ | xargs shfmt -w -p -i 0 -fn

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky@samba.org>

diff --git a/source4/torture/tests/test_gentest.sh b/source4/torture/tests/test_gentest.sh
index 3e60ef3db200222e3bab207c68e8f9760c5ce054..80a1661c11f367e0be6a1aad0d57ba04c9dc3588 100755 (executable)
--- a/source4/torture/tests/test_gentest.sh
+++ b/source4/torture/tests/test_gentest.sh
@@ -4,10 +4,10 @@
 # based on test_smbclient.sh
 
 if [ $# -lt 4 ]; then
-cat <<EOF
+       cat <<EOF
 Usage: test_gentest.sh SERVER USERNAME PASSWORD DOMAIN PREFIX
 EOF
-exit 1;
+       exit 1
 fi
 
 SERVER=$1
@@ -21,14 +21,14 @@ failed=0
 samba4bindir="$BINDIR"
 gentest="$samba4bindir/gentest"
 
-. `dirname $0`/../../../testprogs/blackbox/subunit.sh
+. $(dirname $0)/../../../testprogs/blackbox/subunit.sh
 
-cat <<EOF > $PREFIX/gentest.ignore
+cat <<EOF >$PREFIX/gentest.ignore
 all_info.out.fname
 internal_information.out.file_id
 EOF
 
-testit "gentest" $VALGRIND $gentest //$SERVER/test1 //$SERVER/test2 --seed=1 --seedsfile=$PREFIX/gentest_seeds.dat --num-ops=100 --ignore=$PREFIX/gentest.ignore -W "$DOMAIN" --user1="$USERNAME%$PASSWORD" --user2="$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1`
+testit "gentest" $VALGRIND $gentest //$SERVER/test1 //$SERVER/test2 --seed=1 --seedsfile=$PREFIX/gentest_seeds.dat --num-ops=100 --ignore=$PREFIX/gentest.ignore -W "$DOMAIN" --user1="$USERNAME%$PASSWORD" --user2="$USERNAME%$PASSWORD" $@ || failed=$(expr $failed + 1)
 
 rm -f $PREFIX/gentest.ignore
 

diff --git a/source4/torture/tests/test_locktest.sh b/source4/torture/tests/test_locktest.sh
index 4509ad0caced03a806b95c2c2f0b2dab940aebfa..d55935e3fb96ca46205dcf7fc044741acbc41258 100755 (executable)
--- a/source4/torture/tests/test_locktest.sh
+++ b/source4/torture/tests/test_locktest.sh
@@ -4,10 +4,10 @@
 # based on test_smbclient.sh
 
 if [ $# -lt 5 ]; then
-cat <<EOF
+       cat <<EOF
 Usage: test_locktest.sh SERVER USERNAME PASSWORD DOMAIN PREFIX
 EOF
-exit 1;
+       exit 1
 fi
 
 SERVER=$1
@@ -21,8 +21,8 @@ failed=0
 samba4bindir="$BINDIR"
 locktest="$samba4bindir/locktest"
 
-. `dirname $0`/../../../testprogs/blackbox/subunit.sh
+. $(dirname $0)/../../../testprogs/blackbox/subunit.sh
 
-testit "locktest" $VALGRIND $locktest //$SERVER/test1 //$SERVER/test2 --num-ops=100  -W "$DOMAIN" --user1="$DOMAIN\\$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1`
+testit "locktest" $VALGRIND $locktest //$SERVER/test1 //$SERVER/test2 --num-ops=100 -W "$DOMAIN" --user1="$DOMAIN\\$USERNAME%$PASSWORD" $@ || failed=$(expr $failed + 1)
 
 exit $failed

diff --git a/source4/torture/tests/test_masktest.sh b/source4/torture/tests/test_masktest.sh
index 83f2f5d72ef8608111630daefa6354deb32c07ec..ab4a07197e06b8962cf568768f3ed4d986635788 100755 (executable)
--- a/source4/torture/tests/test_masktest.sh
+++ b/source4/torture/tests/test_masktest.sh
@@ -4,10 +4,10 @@
 # based on test_smbclient.sh
 
 if [ $# -lt 5 ]; then
-cat <<EOF
+       cat <<EOF
 Usage: test_masktest.sh SERVER USERNAME PASSWORD DOMAIN PREFIX
 EOF
-exit 1;
+       exit 1
 fi
 
 SERVER=$1
@@ -21,8 +21,8 @@ failed=0
 samba4bindir="$BINDIR"
 masktest="$samba4bindir/masktest"
 
-. `dirname $0`/../../../testprogs/blackbox/subunit.sh
+. $(dirname $0)/../../../testprogs/blackbox/subunit.sh
 
-testit "masktest" $VALGRIND $masktest //$SERVER/tmp --num-ops=200 --dieonerror -W "$DOMAIN" -U"$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1`
+testit "masktest" $VALGRIND $masktest //$SERVER/tmp --num-ops=200 --dieonerror -W "$DOMAIN" -U"$USERNAME%$PASSWORD" $@ || failed=$(expr $failed + 1)
 
 exit $failed