test-restore-map-owner: accommodate python 3 and test there

[bup.git] / wvtest-bup.sh

diff --git a/wvtest-bup.sh b/wvtest-bup.sh
index e7e7752eb43e4a9278b65b148af00e2c4d3817e2..d7f0b48f5dfd4dfb4819de87829703a57315102b 100644 (file)
--- a/wvtest-bup.sh
+++ b/wvtest-bup.sh
@@ -8,9 +8,15 @@
 _wvtop="$(pwd)"
 
 wvmktempdir ()
-(
+{
     local script_name="$(basename $0)"
-    set -e -o pipefail
-    mkdir -p "$_wvtop/t/tmp"
-    echo "$(mktemp -d "$_wvtop/t/tmp/$script_name-XXXXXXX")"
-)
+    mkdir -p "$_wvtop/t/tmp" || exit $?
+    mktemp -d "$_wvtop/t/tmp/$script_name-XXXXXXX" || exit $?
+}
+
+wvmkmountpt ()
+{
+    local script_name="$(basename $0)"
+    mkdir -p "$_wvtop/t/mnt" || exit $?
+    mktemp -d "$_wvtop/t/mnt/$script_name-XXXXXXX" || exit $?
+}