[Debian-ha-commits] [ocfs2-tools] 02/03: debian/tests: use temporary directory

[Valentin Vidic]

This is an automated email from the git hooks/post-receive script.

vvidic-guest pushed a commit to branch master
in repository ocfs2-tools.

commit b43e43990054897f3a2b6129c57f670bc25c530b
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Fri Oct 21 16:18:30 2016 +0200

    debian/tests: use temporary directory
---
 debian/tests/o2cb | 16 +++++++++-------
 debian/tests/pcmk | 16 +++++++++-------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/debian/tests/o2cb b/debian/tests/o2cb
index 3dd64f2..da175f5 100644
--- a/debian/tests/o2cb
+++ b/debian/tests/o2cb
@@ -2,10 +2,12 @@
 
 set -e
 
+DISK=$AUTOPKGTEST_TMP/disk
+
 cleanup () {
   umount /mnt || true
   [ "$LOOP" ] && losetup -d $LOOP
-  rm -f disk disk.image || true
+  rm -f $DISK $DISK.image || true
   service o2cb stop
   sed -i -e 's/^O2CB_ENABLED=.*/O2CB_ENABLED=false/' /etc/default/o2cb
 }
@@ -51,16 +53,16 @@ o2cb_ctl -I -n $HOSTNAME
 
 # create test disk
 echo "=== losetup ==="
-dd if=/dev/zero of=disk bs=1M count=200 2>&1
-LOOP=$(losetup --find --show disk)
+dd if=/dev/zero of=$DISK bs=1M count=200 2>&1
+LOOP=$(losetup --find --show $DISK)
 
 # test tools
 echo "=== mkfs ==="
 mkfs.ocfs2 --cluster-stack=o2cb --cluster-name=ocfs2 $LOOP 2>&1
 
 echo "=== o2image ==="
-o2image $LOOP disk.image
-ls -l disk.image
+o2image $LOOP $DISK.image
+ls -l $DISK.image
 
 echo "=== fsck ==="
 fsck.ocfs2 -f -y $LOOP 2>&1
@@ -69,7 +71,7 @@ echo "=== o2cluster ==="
 o2cluster -o $LOOP
 
 echo "=== tunefs ==="
-tunefs.ocfs2 -L disk -N 3 -Q 'Label = %V\nNumSlots = %N\n' $LOOP
+tunefs.ocfs2 -L $DISK -N 3 -Q 'Label = %V\nNumSlots = %N\n' $LOOP
 
 echo "=== debugfs ==="
 debugfs.ocfs2 -R stats $LOOP
@@ -78,7 +80,7 @@ echo "=== o2info ==="
 o2info --volinfo $LOOP
 
 echo "=== grow ==="
-dd if=/dev/zero of=disk bs=1M count=50 seek=200 2>&1
+dd if=/dev/zero of=$DISK bs=1M count=50 seek=200 2>&1
 losetup --set-capacity $LOOP
 tunefs.ocfs2 -S $LOOP
 
diff --git a/debian/tests/pcmk b/debian/tests/pcmk
index 73e2186..4c9ea42 100644
--- a/debian/tests/pcmk
+++ b/debian/tests/pcmk
@@ -2,10 +2,12 @@
 
 set -e
 
+DISK=$AUTOPKGTEST_TMP/disk
+
 cleanup () {
   umount /mnt || true
   [ "$LOOP" ] && losetup -d $LOOP
-  rm -f disk disk.image || true
+  rm -f $DISK $DISK.image || true
   service dlm stop
   service corosync stop
 }
@@ -23,8 +25,8 @@ dlm_tool status
 
 # create test disk
 echo "=== losetup ==="
-dd if=/dev/zero of=disk bs=1M count=200 2>&1
-LOOP=$(losetup --find --show disk)
+dd if=/dev/zero of=$DISK bs=1M count=200 2>&1
+LOOP=$(losetup --find --show $DISK)
 
 # test tools
 echo "=== mkfs ==="
@@ -34,8 +36,8 @@ echo "=== pcmk ==="
 echo pcmk > /sys/fs/ocfs2/cluster_stack
 
 echo "=== o2image ==="
-o2image $LOOP disk.image
-ls -l disk.image
+o2image $LOOP $DISK.image
+ls -l $DISK.image
 
 echo "=== fsck ==="
 fsck.ocfs2 -f -y $LOOP 2>&1
@@ -44,7 +46,7 @@ echo "=== o2cluster ==="
 o2cluster -o $LOOP
 
 echo "=== tunefs ==="
-tunefs.ocfs2 -L disk -N 3 -Q 'Label = %V\nNumSlots = %N\n' $LOOP
+tunefs.ocfs2 -L $DISK -N 3 -Q 'Label = %V\nNumSlots = %N\n' $LOOP
 
 echo "=== debugfs ==="
 debugfs.ocfs2 -R stats $LOOP
@@ -53,7 +55,7 @@ echo "=== o2info ==="
 o2info --volinfo $LOOP
 
 echo "=== grow ==="
-dd if=/dev/zero of=disk bs=1M count=50 seek=200 2>&1
+dd if=/dev/zero of=$DISK bs=1M count=50 seek=200 2>&1
 losetup --set-capacity $LOOP
 tunefs.ocfs2 -S $LOOP
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/ocfs2-tools.git