Skip sysinit test for cluster

Add #bin/bash to utils.sh
and update fsadm test to current version of aux script

diff --git a/test/lib/utils.sh b/test/lib/utils.sh
index 7f9ec13135db1e387d8d7d8fae9127484a3d490d..69ae2afb148b4c17aa90b4c426e55680e15ccc77 100644 (file)
--- a/test/lib/utils.sh
+++ b/test/lib/utils.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 # Copyright (C) 2011 Red Hat, Inc. All rights reserved.
 #
 # This copyrighted material is made available to anyone wishing to use,

diff --git a/test/t-fsadm.sh b/test/t-fsadm.sh
index bda41d4b5b7fd66bf5d5f333c5a155a51f8bd839..a539ccf3db63cf8aab587a2dabb44e820022cc0f 100644 (file)
--- a/test/t-fsadm.sh
+++ b/test/t-fsadm.sh
@@ -38,7 +38,7 @@ test ! -d $mount_dir && mkdir $mount_dir
 cleanup_mounted_and_teardown()
 {
        umount $mount_dir || true
-       teardown
+       aux teardown
 }
 
 fscheck_ext3()
@@ -68,7 +68,7 @@ check_missing()
 
 # Test for block sizes != 1024 (rhbz #480022)
 lvcreate -n $lv1 -L20M $vg
-trap 'aux cleanup_mounted_and_teardown' EXIT
+trap 'cleanup_mounted_and_teardown' EXIT
 
 if check_missing ext3; then
        mkfs.ext3 -b4096 -j $dev_vg_lv

diff --git a/test/t-vgchange-sysinit.sh b/test/t-vgchange-sysinit.sh
index c89882f69e7aec684df9c07f8c43cc3c311bac4d..a9f24780bcc4e6ddeaf70f345ea74d72449a7cc2 100755 (executable)
--- a/test/t-vgchange-sysinit.sh
+++ b/test/t-vgchange-sysinit.sh
@@ -14,6 +14,7 @@
 which mkfs.ext3 || exit 200
 
 aux prepare_pvs 2 8
+test -e LOCAL_CLVMD && exit 200
 
 var_lock="$DM_DEV_DIR/$vg1/$lv1"
 # keep in sync with aux configured lockingdir