Move the --exclude-rx tests from test.sh to test-save-restore-exclude-rx.sh.

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

diff --git a/Makefile b/Makefile
index 5c0cf6c6edb3bb4317be6a3651858ecd27380b1d..9c85fba737e55ef46a6cf132a17dd36a4133fb10 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -99,6 +99,7 @@ runtests-cmdline: all
        TMPDIR="$(test_tmp)" t/test-rm-between-index-and-save.sh
        TMPDIR="$(test_tmp)" t/test-command-without-init-fails.sh
        TMPDIR="$(test_tmp)" t/test-redundant-saves.sh
+       TMPDIR="$(test_tmp)" t/test-save-restore-exclude-rx.sh
        TMPDIR="$(test_tmp)" t/test.sh
 
 stupid:

diff --git a/t/test-save-restore-exclude-rx.sh b/t/test-save-restore-exclude-rx.sh
new file mode 100755 (executable)
index 0000000..33d6cb1
--- /dev/null
+++ b/t/test-save-restore-exclude-rx.sh
@@ -0,0 +1,189 @@
+#!/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" "$@"; }
+
+WVPASS bup init
+WVPASS cd "$tmpdir"
+
+
+# bup index --exclude-rx ...
+# ==========================
+
+WVSTART "index --exclude-rx '^/foo' (root anchor)"
+WVPASS rm -rf src "$BUP_DIR" buprestore.tmp
+WVPASS bup init
+WVPASS mkdir src
+WVPASS touch src/a
+WVPASS touch src/b
+WVPASS mkdir src/sub1
+WVPASS mkdir src/sub2
+WVPASS touch src/sub1/a
+WVPASS touch src/sub2/b
+WVPASS bup index -u src --exclude-rx "^$(pwd)/src/sub1/"
+WVPASS bup save --strip -n bupdir src
+WVPASS bup restore -C buprestore.tmp /bupdir/latest/
+actual="$(WVPASS cd buprestore.tmp; WVPASS find . | WVPASS sort)" || exit $?
+WVPASSEQ "$actual" ".
+./a
+./b
+./sub2
+./sub2/b"
+
+WVSTART "index --exclude-rx '/foo$' (non-dir, tail anchor)"
+WVPASS rm -rf src "$BUP_DIR" buprestore.tmp
+WVPASS bup init
+WVPASS mkdir src
+WVPASS touch src/a
+WVPASS touch src/b
+WVPASS touch src/foo
+WVPASS mkdir src/sub
+WVPASS mkdir src/sub/foo
+WVPASS touch src/sub/foo/a
+WVPASS bup index -u src --exclude-rx '/foo$'
+WVPASS bup save --strip -n bupdir src
+WVPASS bup restore -C buprestore.tmp /bupdir/latest/
+actual="$(WVPASS cd buprestore.tmp; WVPASS find . | WVPASS sort)" || exit $?
+WVPASSEQ "$actual" ".
+./a
+./b
+./sub
+./sub/foo
+./sub/foo/a"
+
+WVSTART "index --exclude-rx '/foo/$' (dir, tail anchor)"
+WVPASS rm -rf src "$BUP_DIR" buprestore.tmp
+WVPASS bup init
+WVPASS mkdir src
+WVPASS touch src/a
+WVPASS touch src/b
+WVPASS touch src/foo
+WVPASS mkdir src/sub
+WVPASS mkdir src/sub/foo
+WVPASS touch src/sub/foo/a
+WVPASS bup index -u src --exclude-rx '/foo/$'
+WVPASS bup save --strip -n bupdir src
+WVPASS bup restore -C buprestore.tmp /bupdir/latest/
+actual="$(WVPASS cd buprestore.tmp; WVPASS find . | WVPASS sort)" || exit $?
+WVPASSEQ "$actual" ".
+./a
+./b
+./foo
+./sub"
+
+WVSTART "index --exclude-rx '/foo/.' (dir content)"
+WVPASS rm -rf src "$BUP_DIR" buprestore.tmp
+WVPASS bup init
+WVPASS mkdir src
+WVPASS touch src/a
+WVPASS touch src/b
+WVPASS touch src/foo
+WVPASS mkdir src/sub
+WVPASS mkdir src/sub/foo
+WVPASS touch src/sub/foo/a
+WVPASS bup index -u src --exclude-rx '/foo/.'
+WVPASS bup save --strip -n bupdir src
+WVPASS bup restore -C buprestore.tmp /bupdir/latest/
+actual="$(WVPASS cd buprestore.tmp; WVPASS find . | WVPASS sort)" || exit $?
+WVPASSEQ "$actual" ".
+./a
+./b
+./foo
+./sub
+./sub/foo"
+
+
+# bup restore --exclude-rx ...
+# ============================
+
+WVSTART "restore --exclude-rx '^/foo' (root anchor)"
+WVPASS rm -rf src "$BUP_DIR" buprestore.tmp
+WVPASS bup init
+WVPASS mkdir src
+WVPASS touch src/a
+WVPASS touch src/b
+WVPASS mkdir src/sub1
+WVPASS mkdir src/sub2
+WVPASS touch src/sub1/a
+WVPASS touch src/sub2/b
+WVPASS bup index -u src
+WVPASS bup save --strip -n bupdir src
+WVPASS bup restore -C buprestore.tmp --exclude-rx "^/sub1/" /bupdir/latest/
+actual="$(WVPASS cd buprestore.tmp; WVPASS find . | WVPASS sort)" || exit $?
+WVPASSEQ "$actual" ".
+./a
+./b
+./sub2
+./sub2/b"
+
+WVSTART "restore --exclude-rx '/foo$' (non-dir, tail anchor)"
+WVPASS rm -rf src "$BUP_DIR" buprestore.tmp
+WVPASS bup init
+WVPASS mkdir src
+WVPASS touch src/a
+WVPASS touch src/b
+WVPASS touch src/foo
+WVPASS mkdir src/sub
+WVPASS mkdir src/sub/foo
+WVPASS touch src/sub/foo/a
+WVPASS bup index -u src
+WVPASS bup save --strip -n bupdir src
+WVPASS bup restore -C buprestore.tmp --exclude-rx '/foo$' /bupdir/latest/
+actual="$(WVPASS cd buprestore.tmp; WVPASS find . | WVPASS sort)" || exit $?
+WVPASSEQ "$actual" ".
+./a
+./b
+./sub
+./sub/foo
+./sub/foo/a"
+
+WVSTART "restore --exclude-rx '/foo/$' (dir, tail anchor)"
+WVPASS rm -rf src "$BUP_DIR" buprestore.tmp
+WVPASS bup init
+WVPASS mkdir src
+WVPASS touch src/a
+WVPASS touch src/b
+WVPASS touch src/foo
+WVPASS mkdir src/sub
+WVPASS mkdir src/sub/foo
+WVPASS touch src/sub/foo/a
+WVPASS bup index -u src
+WVPASS bup save --strip -n bupdir src
+WVPASS bup restore -C buprestore.tmp --exclude-rx '/foo/$' /bupdir/latest/
+actual="$(WVPASS cd buprestore.tmp; WVPASS find . | WVPASS sort)" || exit $?
+WVPASSEQ "$actual" ".
+./a
+./b
+./foo
+./sub"
+
+WVSTART "restore --exclude-rx '/foo/.' (dir content)"
+WVPASS rm -rf src "$BUP_DIR" buprestore.tmp
+WVPASS bup init
+WVPASS mkdir src
+WVPASS touch src/a
+WVPASS touch src/b
+WVPASS touch src/foo
+WVPASS mkdir src/sub
+WVPASS mkdir src/sub/foo
+WVPASS touch src/sub/foo/a
+WVPASS bup index -u src
+WVPASS bup save --strip -n bupdir src
+WVPASS bup restore -C buprestore.tmp --exclude-rx '/foo/.' /bupdir/latest/
+actual="$(WVPASS cd buprestore.tmp; WVPASS find . | WVPASS sort)" || exit $?
+WVPASSEQ "$actual" ".
+./a
+./b
+./foo
+./sub
+./sub/foo"
+
+WVPASS rm -rf "$tmpdir"

diff --git a/t/test.sh b/t/test.sh
index 9c99068b690a974cdf2f441a2b9d39c5cbab0e32..2413bed4d36fbee87a35782a326221b54298c42d 100755 (executable)
--- a/t/test.sh
+++ b/t/test.sh
@@ -724,180 +724,3 @@ expected="$(WVPASS bup index -p)" || exit $?
 WVPASSEQ "$expected" "$D/bar
 $D/
 ./"
-
-# bup index --exclude-rx ...
-(
-    export BUP_DIR="$TOP/buptest.tmp"
-    D=bupdata.tmp
-
-    WVSTART "index --exclude-rx '^/foo' (root anchor)"
-    WVPASS rm -rf "$D" "$BUP_DIR" buprestore.tmp
-    WVPASS bup init
-    WVPASS mkdir $D
-    WVPASS touch $D/a
-    WVPASS touch $D/b
-    WVPASS mkdir $D/sub1
-    WVPASS mkdir $D/sub2
-    WVPASS touch $D/sub1/a
-    WVPASS touch $D/sub2/b
-    WVPASS bup index -u $D --exclude-rx "^$(pwd)/$D/sub1/"
-    WVPASS bup save --strip -n bupdir $D
-    WVPASS bup restore -C buprestore.tmp /bupdir/latest/
-    actual="$(WVPASS cd buprestore.tmp; WVPASS find . | WVPASS sort)" || exit $?
-    WVPASSEQ "$actual" ".
-./a
-./b
-./sub2
-./sub2/b"
-
-    WVSTART "index --exclude-rx '/foo$' (non-dir, tail anchor)"
-    WVPASS rm -rf "$D" "$BUP_DIR" buprestore.tmp
-    WVPASS bup init
-    WVPASS mkdir $D
-    WVPASS touch $D/a
-    WVPASS touch $D/b
-    WVPASS touch $D/foo
-    WVPASS mkdir $D/sub
-    WVPASS mkdir $D/sub/foo
-    WVPASS touch $D/sub/foo/a
-    WVPASS bup index -u $D --exclude-rx '/foo$'
-    WVPASS bup save --strip -n bupdir $D
-    WVPASS bup restore -C buprestore.tmp /bupdir/latest/
-    actual="$(WVPASS cd buprestore.tmp; WVPASS find . | WVPASS sort)" || exit $?
-    WVPASSEQ "$actual" ".
-./a
-./b
-./sub
-./sub/foo
-./sub/foo/a"
-
-    WVSTART "index --exclude-rx '/foo/$' (dir, tail anchor)"
-    WVPASS rm -rf "$D" "$BUP_DIR" buprestore.tmp
-    WVPASS bup init
-    WVPASS mkdir $D
-    WVPASS touch $D/a
-    WVPASS touch $D/b
-    WVPASS touch $D/foo
-    WVPASS mkdir $D/sub
-    WVPASS mkdir $D/sub/foo
-    WVPASS touch $D/sub/foo/a
-    WVPASS bup index -u $D --exclude-rx '/foo/$'
-    WVPASS bup save --strip -n bupdir $D
-    WVPASS bup restore -C buprestore.tmp /bupdir/latest/
-    actual="$(WVPASS cd buprestore.tmp; WVPASS find . | WVPASS sort)" || exit $?
-    WVPASSEQ "$actual" ".
-./a
-./b
-./foo
-./sub"
-
-    WVSTART "index --exclude-rx '/foo/.' (dir content)"
-    WVPASS rm -rf "$D" "$BUP_DIR" buprestore.tmp
-    WVPASS bup init
-    WVPASS mkdir $D
-    WVPASS touch $D/a
-    WVPASS touch $D/b
-    WVPASS touch $D/foo
-    WVPASS mkdir $D/sub
-    WVPASS mkdir $D/sub/foo
-    WVPASS touch $D/sub/foo/a
-    WVPASS bup index -u $D --exclude-rx '/foo/.'
-    WVPASS bup save --strip -n bupdir $D
-    WVPASS bup restore -C buprestore.tmp /bupdir/latest/
-    actual="$(WVPASS cd buprestore.tmp; WVPASS find . | WVPASS sort)" || exit $?
-    WVPASSEQ "$actual" ".
-./a
-./b
-./foo
-./sub
-./sub/foo"
-) || exit $?
-
-
-# bup restore --exclude-rx ...
-(
-    export BUP_DIR="$TOP/buptest.tmp"
-    D=bupdata.tmp
-
-    WVSTART "restore --exclude-rx '^/foo' (root anchor)"
-    WVPASS rm -rf "$D" "$BUP_DIR" buprestore.tmp
-    WVPASS bup init
-    WVPASS mkdir $D
-    WVPASS touch $D/a
-    WVPASS touch $D/b
-    WVPASS mkdir $D/sub1
-    WVPASS mkdir $D/sub2
-    WVPASS touch $D/sub1/a
-    WVPASS touch $D/sub2/b
-    WVPASS bup index -u $D
-    WVPASS bup save --strip -n bupdir $D
-    WVPASS bup restore -C buprestore.tmp --exclude-rx "^/sub1/" /bupdir/latest/
-    actual="$(WVPASS cd buprestore.tmp; WVPASS find . | WVPASS sort)" || exit $?
-    WVPASSEQ "$actual" ".
-./a
-./b
-./sub2
-./sub2/b"
-
-    WVSTART "restore --exclude-rx '/foo$' (non-dir, tail anchor)"
-    WVPASS rm -rf "$D" "$BUP_DIR" buprestore.tmp
-    WVPASS bup init
-    WVPASS mkdir $D
-    WVPASS touch $D/a
-    WVPASS touch $D/b
-    WVPASS touch $D/foo
-    WVPASS mkdir $D/sub
-    WVPASS mkdir $D/sub/foo
-    WVPASS touch $D/sub/foo/a
-    WVPASS bup index -u $D
-    WVPASS bup save --strip -n bupdir $D
-    WVPASS bup restore -C buprestore.tmp --exclude-rx '/foo$' /bupdir/latest/
-    actual="$(WVPASS cd buprestore.tmp; WVPASS find . | WVPASS sort)" || exit $?
-    WVPASSEQ "$actual" ".
-./a
-./b
-./sub
-./sub/foo
-./sub/foo/a"
-
-    WVSTART "restore --exclude-rx '/foo/$' (dir, tail anchor)"
-    WVPASS rm -rf "$D" "$BUP_DIR" buprestore.tmp
-    WVPASS bup init
-    WVPASS mkdir $D
-    WVPASS touch $D/a
-    WVPASS touch $D/b
-    WVPASS touch $D/foo
-    WVPASS mkdir $D/sub
-    WVPASS mkdir $D/sub/foo
-    WVPASS touch $D/sub/foo/a
-    WVPASS bup index -u $D
-    WVPASS bup save --strip -n bupdir $D
-    WVPASS bup restore -C buprestore.tmp --exclude-rx '/foo/$' /bupdir/latest/
-    actual="$(WVPASS cd buprestore.tmp; WVPASS find . | WVPASS sort)" || exit $?
-    WVPASSEQ "$actual" ".
-./a
-./b
-./foo
-./sub"
-
-    WVSTART "restore --exclude-rx '/foo/.' (dir content)"
-    WVPASS rm -rf "$D" "$BUP_DIR" buprestore.tmp
-    WVPASS bup init
-    WVPASS mkdir $D
-    WVPASS touch $D/a
-    WVPASS touch $D/b
-    WVPASS touch $D/foo
-    WVPASS mkdir $D/sub
-    WVPASS mkdir $D/sub/foo
-    WVPASS touch $D/sub/foo/a
-    WVPASS bup index -u $D
-    WVPASS bup save --strip -n bupdir $D
-    WVPASS bup restore -C buprestore.tmp --exclude-rx '/foo/.' /bupdir/latest/
-    actual="$(WVPASS cd buprestore.tmp; WVPASS find . | WVPASS sort)" || exit $?
-    WVPASSEQ "$actual" ".
-./a
-./b
-./foo
-./sub
-./sub/foo"
-) || exit $?