get: adjust for python 3 and test there

[bup.git] / t / configure-sampledata

diff --git a/t/configure-sampledata b/t/configure-sampledata
index 1603fd8370d1d8f2f3940cfd1fb512d241c14401..cec49eb7b1d431e5cc709d69d47c57dee1af435a 100755 (executable)
--- a/t/configure-sampledata
+++ b/t/configure-sampledata
@@ -5,7 +5,7 @@ set -o pipefail
 # NOTE: any relevant changes to var/ must be accompanied by an
 # increment to the revision.
 
-revision=1
+revision=2
 readonly revision
 
 top="$(pwd)" || exit $?
@@ -19,17 +19,20 @@ if test "$#" -ne 1; then
     usage 1>&2; exit 1
 fi
 
+rm_symlinks()
+{
+    for p in "$@"; do
+        # test -e is false for dangling symlinks.
+        if test -h "$p" -o -e "$p"; then rm "$p" || exit $?; fi
+    done
+}
+
 clean()
 (
     cd t/sampledata || exit $?
     if test -e var; then rm -r var || exit $?; fi
     # Remove legacy content (before everything moved to var/).
-    # test -e is false for dangling symlinks.
-    if test -h b -o -e b; then rm b || exit $?; fi
-    if test -h c -o -e c; then rm c || exit $?; fi
-    if test -h abs-symlink -o -e abs-symlink; then
-        rm abs-symlink || exit $?
-    fi
+    rm_symlinks abs-symlink b c etc
 )
 
 case "$1" in
@@ -41,6 +44,7 @@ case "$1" in
             ln -sf a b || exit $?
             ln -sf b c || exit $?
             ln -sf "$(pwd)/abs-symlink-target" abs-symlink || exit $?
+            mkfifo fifo
             mkdir -p cmd doc lib/bup || exit $?
             cp -pP "$top"/cmd/*.py cmd/ || exit $?
             cp -pP "$top"/Documentation/*.md doc/ || exit $?