test: less use verbose shell constructs

Author: keszybz

test/test-cache.sh.in

@@ -4,7 +4,7 @@
 SCRATCH_DIR=${TMPDIR:-/var/tmp}/test-casync.$RANDOM
 mkdir -p $SCRATCH_DIR/src
 
-if [ `id -u` == 0 ] ; then
+if [ $UID = 0 ]; then
     cp -aT @top_srcdir@ $SCRATCH_DIR/src/casync
 else
     # If we lack privileges we use rsync rather than cp to copy, as it will just skip over device nodes
@@ -63,7 +63,7 @@ cmp $SCRATCH_DIR/test4.caidx $SCRATCH_DIR/test5.caidx
 cmp $SCRATCH_DIR/test4.caidx $SCRATCH_DIR/test6.caidx
 cmp $SCRATCH_DIR/test4.caidx $SCRATCH_DIR/test7.caidx
 
-for f in test4 test5 test6 test7 ; do
+for f in test4 test5 test6 test7; do
     @top_builddir@/casync list $SCRATCH_DIR/$f.caidx > $SCRATCH_DIR/$f.list
     @top_builddir@/casync mtree $SCRATCH_DIR/$f.caidx > $SCRATCH_DIR/$f.mtree
     @top_builddir@/casync digest $SCRATCH_DIR/$f.caidx > $SCRATCH_DIR/$f.digest

test/test-fuse.sh.in

@@ -9,7 +9,7 @@ export CASYNC_PROTOCOL_PATH
 SCRATCH_DIR=${TMPDIR:-/var/tmp}/test-casync.$RANDOM
 mkdir -p $SCRATCH_DIR/src
 
-if [ `id -u` == 0 ] ; then
+if [ $UID = 0 ]; then
     cp -a @top_srcdir@ $SCRATCH_DIR/src
 else
     # If we lack privileges we use rsync rather than cp to copy, as it will just skip over device nodes
@@ -28,9 +28,9 @@ diff -q $SCRATCH_DIR/test.digest $SCRATCH_DIR/test.caidx.digest
 
 diff -q $SCRATCH_DIR/test.digest $SCRATCH_DIR/extract.digest
 
-if [ `id -u` == 0 ] ; then
+if [ $UID = 0 ]; then
     modprobe fuse ||:
-    if test -e /dev/fuse ; then
+    if [ -e /dev/fuse ]; then
         MOUNT_PID=`@top_builddir@/notify-wait @top_builddir@/casync $PARAMS mount $SCRATCH_DIR/test.caidx $SCRATCH_DIR/mount`
 
         @top_builddir@/casync $PARAMS digest $SCRATCH_DIR/extract > $SCRATCH_DIR/mount.digest

test/test-nbd.sh.in

@@ -1,16 +1,10 @@
 #!/bin/bash -ex
 # SPDX-License-Identifier: LGPL-2.1+
 
-if [ -z "$1" ] ; then
-    DIGEST=sha512-256
-else
-    DIGEST="$1"
-fi
-
+DIGEST=${1:-sha512-256}
 PARAMS="-v --digest=$DIGEST"
 
-CASYNC_PROTOCOL_PATH=@top_builddir@
-export CASYNC_PROTOCOL_PATH
+export CASYNC_PROTOCOL_PATH=@top_builddir@
 
 SCRATCH_DIR=${TMPDIR:-/var/tmp}/test-casync.$RANDOM
 mkdir -p $SCRATCH_DIR
@@ -35,7 +29,7 @@ diff -q $SCRATCH_DIR/test.digest $SCRATCH_DIR/test.caibx.digest
 diff -q $SCRATCH_DIR/test.digest $SCRATCH_DIR/extract.digest
 diff -q $SCRATCH_DIR/test.digest $SCRATCH_DIR/extract2.digest
 
-if [ `id -u` == 0 ] ; then
+if [ $UID = 0 ]; then
     modprobe nbd ||:
 
     if test -e /dev/nbd0 ; then

test/test-script.sh.in

@@ -1,31 +1,20 @@
 #!/bin/bash -ex
 # SPDX-License-Identifier: LGPL-2.1+
 
-if [ -z "$1" ] ; then
-    DIGEST=sha512-256
-else
-    DIGEST="$1"
-fi
+DIGEST=${1:-sha512-256}
+COMPRESSION=${2:-zstd}
 
-if [ -z "$2" ] ; then
-    COMPRESSION=zstd
-else
-    COMPRESSION="$2"
+PARAMS="-v --digest=$DIGEST --compression=$COMPRESSION"
+if [ $UID != 0 ]; then
+    PARAMS="$PARAMS --without=privileged"
 fi
 
-if [ `id -u` == 0 ] ; then
-    PARAMS="-v --digest=$DIGEST --compression=$COMPRESSION"
-else
-    PARAMS="-v --without=privileged --digest=$DIGEST --compression=$COMPRESSION"
-fi
-
-CASYNC_PROTOCOL_PATH=@top_builddir@
-export CASYNC_PROTOCOL_PATH
+export CASYNC_PROTOCOL_PATH=@top_builddir@
 
 SCRATCH_DIR=${TMPDIR:-/var/tmp}/test-casync.$RANDOM
 mkdir -p $SCRATCH_DIR/src
 
-if [ `id -u` == 0 ] ; then
+if [ $UID = 0 ]; then
     cp -aT @top_srcdir@ $SCRATCH_DIR/src/casync
 else
     # If we lack privileges we use rsync rather than cp to copy, as it will just skip over device nodes
@@ -136,11 +125,8 @@ diff -q $SCRATCH_DIR/original-seek.mtree $SCRATCH_DIR/extract-seek-caidx.mtree
 
 ### Test SSH Remoting
 
-CASYNC_SSH_PATH=@top_srcdir@/test/pseudo-ssh
-export CASYNC_SSH_PATH
-
-CASYNC_REMOTE_PATH=@top_builddir@/casync
-export CASYNC_REMOTE_PATH
+export CASYNC_SSH_PATH=@top_srcdir@/test/pseudo-ssh
+export CASYNC_REMOTE_PATH=@top_builddir@/casync
 
 @top_builddir@/casync $PARAMS list localhost:$SCRATCH_DIR/test.caidx > $SCRATCH_DIR/test-remote.caidx.list
 @top_builddir@/casync $PARAMS mtree localhost:$SCRATCH_DIR/test.caidx > $SCRATCH_DIR/test-remote.caidx.mtree
@@ -180,8 +166,7 @@ diff -q $SCRATCH_DIR/test.digest $SCRATCH_DIR/test2.catar.digest
 
 HTTP_PORT=$((10000 + $$ % 10000))
 
-CASYNC_PROTOCOL_PATH=@top_builddir@
-export CASYNC_PROTOCOL_PATH
+export CASYNC_PROTOCOL_PATH=@top_builddir@
 
 HTTP_PID=`@top_builddir@/notify-wait  @top_srcdir@/test/http-server.py $SCRATCH_DIR $HTTP_PORT`