Visually better align lines which are executed as a result of true

or false result of previous command.

diff --git a/test/lvm-utils.sh b/test/lvm-utils.sh
index 39d52fdfb9945b6b26e0e4af0f28f2b8a90e4d17..6c00084f4a14c91a86d914579dd0ee7f17f00798 100644 (file)
--- a/test/lvm-utils.sh
+++ b/test/lvm-utils.sh
@@ -129,9 +129,9 @@ vg_validate_pvlv_counts_()
 
        lvs -a -o+devices $local_vg
 
-       check_vg_field_ $local_vg pv_count $num_pvs &&
-       check_vg_field_ $local_vg lv_count $num_lvs &&
-       check_vg_field_ $local_vg snap_count $num_snaps
+       check_vg_field_ $local_vg pv_count $num_pvs && \
+         check_vg_field_ $local_vg lv_count $num_lvs && \
+         check_vg_field_ $local_vg snap_count $num_snaps
 }
 
 dmsetup_has_dm_devdir_support_()

diff --git a/test/t-000-basic.sh b/test/t-000-basic.sh
index c70a7f8bcd87ea34d48385134c8962491f6c468a..ed76a6fc82ccad2df1726f3e09db2b52e31ee97d 100755 (executable)
--- a/test/t-000-basic.sh
+++ b/test/t-000-basic.sh
@@ -20,9 +20,9 @@ lvm pvmove --version|sed -n "1s/.*: *\([0-9][^ ]*\) .*/\1/p" > actual
 # ensure they are the same
 diff -u actual expected
 
-mknod $DM_DEV_DIR/null c 1 3 ||
+mknod $DM_DEV_DIR/null c 1 3 || \
   error "Can't create nodes on filesystem"
-echo >$DM_DEV_DIR/null || 
+echo >$DM_DEV_DIR/null || \
   error "Filesystem for tests does not allow using device nodes (check nodev)"
 
 # ensure we can create devices (uses dmsetup, etc)

diff --git a/test/t-pvmove-basic.sh b/test/t-pvmove-basic.sh
index cc2145b2b16ee651211be8d94689aa6caf93bc69..44b533c9ba53c9c7e6224e7f7fbd8a09763976bc 100755 (executable)
--- a/test/t-pvmove-basic.sh
+++ b/test/t-pvmove-basic.sh
@@ -33,8 +33,7 @@ lv_is_on_() {
 }
 
 save_dev_sum_() {
-  mkfs.ext3 $1 > /dev/null &&
-  md5sum $1 > md5.$(basename $1)
+  mkfs.ext3 $1 > /dev/null && md5sum $1 > md5.$(basename $1)
 }
 
 check_dev_sum_() {
@@ -83,8 +82,8 @@ check_and_cleanup_lvs_() {
   lvs -a -o name $vg > out && ! grep ^pvmove out
   lvremove -ff $vg
        if ! dmsetup table|not grep $vg; then
-               echo "ERROR: lvremove did leave some some mappings in DM behind!" &&
-               return 1
+               echo "ERROR: lvremove did leave some some mappings in DM behind!" && \
+                       return 1
        fi
        :
 }