Move import-rdiff-backup tests from test.sh to test-import-rdiff-backup.sh.

Signed-off-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/Makefile b/Makefile
index b125a6e3836786409726a9d938446ca147d102a6..0fe347550d063e1c5b531afbcdbdcf057b23b703 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -98,6 +98,7 @@ runtests-cmdline: all
        TMPDIR="$(test_tmp)" t/test-redundant-saves.sh
        TMPDIR="$(test_tmp)" t/test-save-restore-exclude-rx.sh
        TMPDIR="$(test_tmp)" t/test-save-strip-graft.sh
+       TMPDIR="$(test_tmp)" t/test-import-rdiff-backup.sh
        TMPDIR="$(test_tmp)" t/test.sh
 
 stupid:

diff --git a/t/test-import-rdiff-backup.sh b/t/test-import-rdiff-backup.sh
new file mode 100755 (executable)
index 0000000..daa5a58
--- /dev/null
+++ b/t/test-import-rdiff-backup.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+. ./wvtest-bup.sh
+
+set -o pipefail
+
+top="$(WVPASS pwd)" || exit $?
+tmpdir="$(WVPASS wvmktempdir)" || exit $?
+
+export BUP_DIR="$tmpdir/bup"
+export GIT_DIR="$tmpdir/bup"
+
+bup() { "$top/bup" "$@"; }
+
+if ! [ "$(type -p rdiff-backup)" != "" ]; then
+    # FIXME: add WVSKIP.
+    echo "Cannot find rdiff-backup; skipping test)" 1>&2
+    exit 0
+fi
+
+D=rdiff-backup.tmp
+WVSTART "import-rdiff-backup"
+WVPASS bup init
+WVPASS cd "$tmpdir"
+WVPASS mkdir rdiff-backup
+WVPASS rdiff-backup "$top/cmd" rdiff-backup
+WVPASS bup tick
+WVPASS rdiff-backup "$top/Documentation" rdiff-backup
+WVPASS bup import-rdiff-backup rdiff-backup import-rdiff-backup
+WVPASSEQ $(bup ls import-rdiff-backup/ | wc -l) 3
+WVPASSEQ "$(bup ls -A import-rdiff-backup/latest/ | sort)" \
+    "$(ls -A "$top/Documentation" | sort)"
+
+WVPASS rm -rf "$tmpdir"

diff --git a/t/test.sh b/t/test.sh
index a5c286b49db747e8227e0d75fe9ba7a7c936ed36..9c344e24b4b305e1e8ce4b932f305609834565be 100755 (executable)
--- a/t/test.sh
+++ b/t/test.sh
@@ -451,24 +451,6 @@ WVPASSEQ "$(bup ls -F buptest/latest/)" "a/
 c/"
 
 
-if [ "$(type -p rdiff-backup)" != "" ]; then
-    WVSTART "import-rdiff-backup"
-    D=rdiff-backup.tmp
-    export BUP_DIR="$TOP/$D/.bup"
-    WVPASS force-delete $D
-    WVPASS mkdir $D
-    WVPASS bup init
-    WVPASS mkdir $D/rdiff-backup
-    WVPASS rdiff-backup $TOP/cmd $D/rdiff-backup
-    WVPASS bup tick
-    WVPASS rdiff-backup $TOP/Documentation $D/rdiff-backup
-    WVPASS bup import-rdiff-backup $D/rdiff-backup import-rdiff-backup
-    WVPASSEQ $(bup ls import-rdiff-backup/ | wc -l) 3
-    WVPASSEQ "$(bup ls -A import-rdiff-backup/latest/ | sort)" \
-        "$(ls -A $TOP/Documentation | sort)"
-fi
-
-
 WVSTART "compression"
 D=compression0.tmp
 export BUP_DIR="$TOP/$D/.bup"