Adjust rm-cmd and bup.rm for python 3 and enable test-rm

[bup.git] / t / test-xdev.sh

diff --git a/t/test-xdev.sh b/t/test-xdev.sh
index 424692aa461b8571ca8cab2248e229b4d2580e0c..e9817062fdd5b2eda6a1558b151194a2dba81fe8 100755 (executable)
--- a/t/test-xdev.sh
+++ b/t/test-xdev.sh
@@ -3,7 +3,9 @@
 
 set -o pipefail
 
-if [ $(t/root-status) != root ]; then
+root_status="$(t/root-status)" || exit $?
+
+if [ "$root_status" != root ]; then
     WVSTART 'not root: skipping tests'
     exit 0 # FIXME: add WVSKIP.
 fi
@@ -39,7 +41,7 @@ WVPASS mkfs -F testfs-1.img # Don't care what type (though must have symlinks)
 WVPASS mkfs -F testfs-2.img # Don't care what type (though must have symlinks)
 WVPASS mkdir -p src/mnt-1/hidden-1 src/mnt-2/hidden-2
 WVPASS mount -o loop testfs-1.img src/mnt-1
-WVPASS mount -o loop testfs-1.img src/mnt-2
+WVPASS mount -o loop testfs-2.img src/mnt-2
 
 WVPASS touch src/1