X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=t%2Ftest-meta.sh;h=f25106560acce071ac54456b23d9a856af297b64;hb=ea0cb087050dc86bae886c0b2605b83aa819b7d3;hp=29c182813a35d38bb8b28a29c7faab6210c9b881;hpb=8622b8cccd80979d8fb10831b9f66be621e70de9;p=bup.git

diff --git a/t/test-meta.sh b/t/test-meta.sh
index 29c1828..f251065 100755
--- a/t/test-meta.sh
+++ b/t/test-meta.sh
@@ -1,9 +1,23 @@
 #!/usr/bin/env bash
-. wvtest.sh
-. t/lib.sh
+. wvtest-bup.sh || exit $?
+. t/lib.sh || exit $?
 
-TOP="$(pwd)"
-export BUP_DIR="$TOP/buptest.tmp"
+set -o pipefail
+
+root_status="$(t/root-status)" || exit $?
+
+TOP="$(WVPASS pwd)" || exit $?
+tmpdir="$(WVPASS wvmktempdir)" || exit $?
+export BUP_DIR="$tmpdir/bup"
+
+# Assume that mvmktempdir will always use the same dir.
+timestamp_resolutions="$(t/ns-timestamp-resolutions "$tmpdir/canary")" \
+    || exit $?
+atime_resolution="$(echo $timestamp_resolutions | WVPASS cut -d' ' -f 1)" \
+    || exit $?
+mtime_resolution="$(echo $timestamp_resolutions | WVPASS cut -d' ' -f 2)" \
+    || exit $?
+WVPASS rm "$tmpdir/canary"
 
 bup()
 {
@@ -15,6 +29,11 @@ hardlink-sets()
     "$TOP/t/hardlink-sets" "$@"
 }
 
+id-other-than()
+{
+    "$TOP/t/id-other-than" "$@"
+}
+
 # Very simple metadata tests -- create a test tree then check that bup
 # meta can reproduce the metadata correctly (according to bup xstat)
 # via create, extract, start-extract, and finish-extract.  The current
@@ -26,7 +45,10 @@ genstat()
     (
         export PATH="$TOP:$PATH" # pick up bup
         # Skip atime (test elsewhere) to avoid the observer effect.
-        find . | sort | xargs bup xstat --exclude-fields ctime,atime,size
+        WVPASS find . | WVPASS sort \
+            | WVPASS xargs bup xstat \
+            --mtime-resolution "$mtime_resolution"ns \
+            --exclude-fields ctime,atime,size
     )
 }
 
@@ -35,22 +57,22 @@ test-src-create-extract()
     # Test bup meta create/extract for ./src -> ./src-restore.
     # Also writes to ./src-stat and ./src-restore-stat.
     (
-        (cd src && WVPASS genstat) > src-stat
+        (WVPASS cd src; WVPASS genstat) > src-stat || exit $?
         WVPASS bup meta --create --recurse --file src.meta src
         # Test extract.
-        force-delete src-restore
-        mkdir src-restore
-        cd src-restore
+        WVPASS force-delete src-restore
+        WVPASS mkdir src-restore
+        WVPASS cd src-restore
         WVPASS bup meta --extract --file ../src.meta
         WVPASS test -d src
-        (cd src && genstat >../../src-restore-stat) || WVFAIL
+        (WVPASS cd src; WVPASS genstat >../../src-restore-stat) || exit $?
         WVPASS diff -U5 ../src-stat ../src-restore-stat
         # Test start/finish extract.
-        force-delete src
+        WVPASS force-delete src
         WVPASS bup meta --start-extract --file ../src.meta
         WVPASS test -d src
         WVPASS bup meta --finish-extract --file ../src.meta
-        (cd src && genstat >../../src-restore-stat) || WVFAIL
+        (WVPASS cd src; WVPASS genstat >../../src-restore-stat) || exit $?
         WVPASS diff -U5 ../src-stat ../src-restore-stat
     )
 }
@@ -58,162 +80,173 @@ test-src-create-extract()
 test-src-save-restore()
 {
     # Test bup save/restore metadata for ./src -> ./src-restore.  Also
-    # writes to ./src.bup.  Note that for now this just tests the
+    # writes to BUP_DIR.  Note that for now this just tests the
     # restore below src/, in order to avoid having to worry about
     # operations that require root (like chown /home).
     (
-        set -x
-        rm -rf src.bup
-        mkdir src.bup
-        export BUP_DIR=$(pwd)/src.bup
+        WVPASS rm -rf "$BUP_DIR"
         WVPASS bup init
         WVPASS bup index src
         WVPASS bup save -t -n src src
         # Test extract.
-        force-delete src-restore
-        mkdir src-restore
+        WVPASS force-delete src-restore
+        WVPASS mkdir src-restore
         WVPASS bup restore -C src-restore "/src/latest$(pwd)/"
         WVPASS test -d src-restore/src
         WVPASS "$TOP/t/compare-trees" -c src/ src-restore/src/
-        rm -rf src.bup
-        set +x
+        WVPASS rm -rf src.bup
     )
 }
 
-universal-cleanup()
-{
-    if ! actually-root; then return 0; fi
-    cd "$TOP"
-    umount "$TOP/bupmeta.tmp/testfs" || true
-    umount "$TOP/bupmeta.tmp/testfs-limited" || true
-}
-
-universal-cleanup
-trap universal-cleanup EXIT
-
 setup-test-tree()
-(
-    set -e
-    force-delete "$BUP_DIR"
-    force-delete "$TOP/bupmeta.tmp"
-    mkdir -p "$TOP/bupmeta.tmp/src"
-    cp -pPR Documentation cmd lib t "$TOP/bupmeta.tmp"/src
+{
+    WVPASS "$TOP/t/sync-tree" "$TOP/t/sampledata/" "$tmpdir/src/"
 
     # Add some hard links for the general tests.
     (
-        cd "$TOP/bupmeta.tmp"/src
-        touch hardlink-target
-        ln hardlink-target hardlink-1
-        ln hardlink-target hardlink-2
-        ln hardlink-target hardlink-3
-    )
+        WVPASS cd "$tmpdir"/src
+        WVPASS touch hardlink-target
+        WVPASS ln hardlink-target hardlink-1
+        WVPASS ln hardlink-target hardlink-2
+        WVPASS ln hardlink-target hardlink-3
+    ) || exit $?
 
     # Add some trivial files for the index, modify, save tests.
     (
-        cd "$TOP/bupmeta.tmp"/src
-        mkdir volatile
-        touch volatile/{1,2,3}
-    )
+        WVPASS cd "$tmpdir"/src
+        WVPASS mkdir volatile
+        WVPASS touch volatile/{1,2,3}
+    ) || exit $?
 
     # Regression test for metadata sort order.  Previously, these two
     # entries would sort in the wrong order because the metadata
     # entries were being sorted by mangled name, but the index isn't.
-    dd if=/dev/zero of="$TOP/bupmeta.tmp"/src/foo bs=1k count=33
-    touch -d 2011-11-11 "$TOP/bupmeta.tmp"/src/foo
-    touch -d 2011-12-12 "$TOP/bupmeta.tmp"/src/foo-bar
+    WVPASS dd if=/dev/zero of="$tmpdir"/src/foo bs=1k count=33
+    WVPASS touch -t 201111111111 "$tmpdir"/src/foo
+    WVPASS touch -t 201112121111 "$tmpdir"/src/foo-bar
 
-    t/mksock "$TOP/bupmeta.tmp/src/test-socket" || true
-) || WVFAIL
+    t/mksock "$tmpdir"/src/test-socket || true
+}
 
 # Use the test tree to check bup meta.
 WVSTART 'meta --create/--extract'
 (
-    setup-test-tree
-    cd "$TOP/bupmeta.tmp"
-    test-src-create-extract
+    tmpdir="$(WVPASS wvmktempdir)" || exit $?
+    export BUP_DIR="$tmpdir/bup"
+    WVPASS setup-test-tree
+    WVPASS cd "$tmpdir"
+    WVPASS test-src-create-extract
 
     # Test a top-level file (not dir).
-    touch src-file
+    WVPASS touch src-file
     WVPASS bup meta -cf src-file.meta src-file
-    mkdir dest
-    cd dest
+    WVPASS mkdir dest
+    WVPASS cd dest
     WVPASS bup meta -xf ../src-file.meta
-)
+    WVPASS rm -r "$tmpdir"
+) || exit $?
 
 # Use the test tree to check bup save/restore metadata.
 WVSTART 'metadata save/restore (general)'
 (
-    setup-test-tree
-    cd "$TOP/bupmeta.tmp"
-    test-src-save-restore
-)
+    tmpdir="$(WVPASS wvmktempdir)" || exit $?
+    export BUP_DIR="$tmpdir/bup"
+    WVPASS setup-test-tree
+    WVPASS cd "$tmpdir"
+    WVPASS test-src-save-restore
+
+    # Test a deeper subdir/ to make sure top-level non-dir metadata is
+    # restored correctly.  We need at least one dir and one non-dir at
+    # the "top-level".
+    WVPASS test -d src/var/cmd
+    WVPASS test -f src/var/cmd/save-cmd.py
+    WVPASS rm -rf "$BUP_DIR"
+    WVPASS bup init
+    WVPASS touch -t 201111111111 src-restore # Make sure the top won't match.
+    WVPASS bup index src
+    WVPASS bup save -t -n src src
+    WVPASS force-delete src-restore
+    WVPASS bup restore -C src-restore "/src/latest$(pwd)/src/var/."
+    WVPASS touch -t 201211111111 src-restore # Make sure the top won't match.
+    # Check that the only difference is the top dir.
+    WVFAIL $TOP/t/compare-trees -c src/var/ src-restore/ > tmp-compare-trees
+    WVPASSEQ $(cat tmp-compare-trees | wc -l) 1
+    # The number of rsync status characters varies, so accept any
+    # number of trailing dots.  For example OS X native rsync produces
+    # 9, but Homebrew's produces 12, while on other platforms, 11 is
+    # common.
+    expected_diff_rx='^\.d\.\.t\.\.\.(\.)+ \./$'
+    if ! grep -qE "$expected_diff_rx" tmp-compare-trees; then
+        echo -n 'tmp-compare-trees: ' 1>&2
+        cat tmp-compare-trees 1>&2
+    fi
+    WVPASS grep -qE "$expected_diff_rx" tmp-compare-trees
+    WVPASS rm -r "$tmpdir"
+) || exit $?
 
 # Test that we pull the index (not filesystem) metadata for any
 # unchanged files whenever we're saving other files in a given
 # directory.
 WVSTART 'metadata save/restore (using index metadata)'
 (
-    setup-test-tree
-    cd "$TOP/bupmeta.tmp"
+    tmpdir="$(WVPASS wvmktempdir)" || exit $?
+    export BUP_DIR="$tmpdir/bup"
+    WVPASS setup-test-tree
+    WVPASS cd "$tmpdir"
 
     # ...for now -- might be a problem with hardlink restores that was
     # causing noise wrt this test.
-    rm -rf src/hardlink*
+    WVPASS rm -rf src/hardlink*
 
     # Pause here to keep the filesystem changes far enough away from
     # the first index run that bup won't cap their index timestamps
     # (see "bup help index" for more information).  Without this
     # sleep, the compare-trees test below "Bup should *not* pick up
     # these metadata..." may fail.
-    sleep 1
+    WVPASS sleep 1
 
-    set -x
-    rm -rf src.bup
-    mkdir src.bup
-    export BUP_DIR=$(pwd)/src.bup
+    WVPASS rm -rf "$BUP_DIR"
     WVPASS bup init
     WVPASS bup index src
     WVPASS bup save -t -n src src
 
-    force-delete src-restore-1
-    mkdir src-restore-1
+    WVPASS force-delete src-restore-1
+    WVPASS mkdir src-restore-1
     WVPASS bup restore -C src-restore-1 "/src/latest$(pwd)/"
     WVPASS test -d src-restore-1/src
     WVPASS "$TOP/t/compare-trees" -c src/ src-restore-1/src/
 
-    echo "blarg" > src/volatile/1
-    cp -a src/volatile/1 src-restore-1/src/volatile/
+    WVPASS echo "blarg" > src/volatile/1
+    WVPASS cp -pP src/volatile/1 src-restore-1/src/volatile/
     WVPASS bup index src
 
     # Bup should *not* pick up these metadata changes.
-    touch src/volatile/2
+    WVPASS touch src/volatile/2
 
     WVPASS bup save -t -n src src
 
-    force-delete src-restore-2
-    mkdir src-restore-2
+    WVPASS force-delete src-restore-2
+    WVPASS mkdir src-restore-2
     WVPASS bup restore -C src-restore-2 "/src/latest$(pwd)/"
     WVPASS test -d src-restore-2/src
     WVPASS "$TOP/t/compare-trees" -c src-restore-1/src/ src-restore-2/src/
 
-    rm -rf src.bup
-    set +x
-)
+    WVPASS rm -r "$tmpdir"
+
+) || exit $?
+
 
 setup-hardlink-test()
 {
-    (
-        cd "$TOP/bupmeta.tmp"
-        rm -rf src src.bup
-        mkdir src src.bup
-        WVPASS bup init
-    )
+    WVPASS rm -rf "$tmpdir/src" "$BUP_DIR"
+    WVPASS bup init
+    WVPASS mkdir "$tmpdir/src"
 }
 
 hardlink-test-run-restore()
 {
-    force-delete src-restore
-    mkdir src-restore
+    WVPASS force-delete src-restore
+    WVPASS mkdir src-restore
     WVPASS bup restore -C src-restore "/src/latest$(pwd)/"
     WVPASS test -d src-restore/src
 }
@@ -221,122 +254,126 @@ hardlink-test-run-restore()
 # Test hardlinks more carefully.
 WVSTART 'metadata save/restore (hardlinks)'
 (
-    set -e
-    set -x
-    export BUP_DIR="$TOP/bupmeta.tmp/src.bup"
-    force-delete "$TOP/bupmeta.tmp"
-    mkdir -p "$TOP/bupmeta.tmp"
-
-    cd "$TOP/bupmeta.tmp"
+    tmpdir="$(WVPASS wvmktempdir)" || exit $?    
+    export BUP_DIR="$tmpdir/bup"
 
+    WVPASS setup-hardlink-test
+    WVPASS cd "$tmpdir"
+    
     # Test trivial case - single hardlink.
-    setup-hardlink-test
     (
-        cd "$TOP/bupmeta.tmp"/src
-        touch hardlink-target
-        ln hardlink-target hardlink-1
-    )
+        WVPASS cd src
+        WVPASS touch hardlink-target
+        WVPASS ln hardlink-target hardlink-1
+    ) || exit $?
     WVPASS bup index src
     WVPASS bup save -t -n src src
-    hardlink-test-run-restore
+    WVPASS hardlink-test-run-restore
     WVPASS "$TOP/t/compare-trees" -c src/ src-restore/src/
 
     # Test the case where the hardlink hasn't changed, but the tree
     # needs to be saved again. i.e. the save-cmd.py "if hashvalid:"
     # case.
     (
-        cd "$TOP/bupmeta.tmp"/src
-        echo whatever > something-new
-    )
+        WVPASS cd src
+        WVPASS echo whatever > something-new
+    ) || exit $?
     WVPASS bup index src
     WVPASS bup save -t -n src src
-    hardlink-test-run-restore
+    WVPASS hardlink-test-run-restore
     WVPASS "$TOP/t/compare-trees" -c src/ src-restore/src/
 
     # Test hardlink changes between index runs.
     #
-    setup-hardlink-test
-    cd "$TOP/bupmeta.tmp"/src
-    touch hardlink-target-a
-    touch hardlink-target-b
-    ln hardlink-target-a hardlink-b-1
-    ln hardlink-target-a hardlink-a-1
-    cd ..
+    WVPASS setup-hardlink-test
+    WVPASS cd src
+    WVPASS touch hardlink-target-a
+    WVPASS touch hardlink-target-b
+    WVPASS ln hardlink-target-a hardlink-b-1
+    WVPASS ln hardlink-target-a hardlink-a-1
+    WVPASS cd ..
     WVPASS bup index -vv src
-    rm src/hardlink-b-1
-    ln src/hardlink-target-b src/hardlink-b-1
+    WVPASS rm src/hardlink-b-1
+    WVPASS ln src/hardlink-target-b src/hardlink-b-1
     WVPASS bup index -vv src
     WVPASS bup save -t -n src src
-    hardlink-test-run-restore
-    echo ./src/hardlink-a-1 > hardlink-sets.expected
-    echo ./src/hardlink-target-a >> hardlink-sets.expected
-    echo >> hardlink-sets.expected
-    echo ./src/hardlink-b-1 >> hardlink-sets.expected
-    echo ./src/hardlink-target-b >> hardlink-sets.expected
-    (cd src-restore && hardlink-sets .) > hardlink-sets.restored
+    WVPASS hardlink-test-run-restore
+    WVPASS echo ./src/hardlink-a-1 > hardlink-sets.expected
+    WVPASS echo ./src/hardlink-target-a >> hardlink-sets.expected
+    WVPASS echo >> hardlink-sets.expected
+    WVPASS echo ./src/hardlink-b-1 >> hardlink-sets.expected
+    WVPASS echo ./src/hardlink-target-b >> hardlink-sets.expected
+    (WVPASS cd src-restore; WVPASS hardlink-sets .) > hardlink-sets.restored \
+        || exit $?
     WVPASS diff -u hardlink-sets.expected hardlink-sets.restored
 
     # Test hardlink changes between index and save -- hardlink set [a
     # b c d] changes to [a b] [c d].  At least right now bup should
     # notice and recreate the latter.
-    setup-hardlink-test
-    cd "$TOP/bupmeta.tmp"/src
-    touch a
-    ln a b
-    ln a c
-    ln a d
-    cd ..
+    WVPASS setup-hardlink-test
+    WVPASS cd "$tmpdir"/src
+    WVPASS touch a
+    WVPASS ln a b
+    WVPASS ln a c
+    WVPASS ln a d
+    WVPASS cd ..
     WVPASS bup index -vv src
-    rm src/c src/d
-    touch src/c
-    ln src/c src/d
+    WVPASS rm src/c src/d
+    WVPASS touch src/c
+    WVPASS ln src/c src/d
     WVPASS bup save -t -n src src
-    hardlink-test-run-restore
-    echo ./src/a > hardlink-sets.expected
-    echo ./src/b >> hardlink-sets.expected
-    echo >> hardlink-sets.expected
-    echo ./src/c >> hardlink-sets.expected
-    echo ./src/d >> hardlink-sets.expected
-    (cd src-restore && hardlink-sets .) > hardlink-sets.restored
+    WVPASS hardlink-test-run-restore
+    WVPASS echo ./src/a > hardlink-sets.expected
+    WVPASS echo ./src/b >> hardlink-sets.expected
+    WVPASS echo >> hardlink-sets.expected
+    WVPASS echo ./src/c >> hardlink-sets.expected
+    WVPASS echo ./src/d >> hardlink-sets.expected
+    (WVPASS cd src-restore; WVPASS hardlink-sets .) > hardlink-sets.restored \
+        || exit $?
     WVPASS diff -u hardlink-sets.expected hardlink-sets.restored
 
     # Test that we don't link outside restore tree.
-    setup-hardlink-test
-    cd "$TOP/bupmeta.tmp"
-    mkdir src/a src/b
-    touch src/a/1
-    ln src/a/1 src/b/1
+    WVPASS setup-hardlink-test
+    WVPASS cd "$tmpdir"
+    WVPASS mkdir src/a src/b
+    WVPASS touch src/a/1
+    WVPASS ln src/a/1 src/b/1
     WVPASS bup index -vv src
     WVPASS bup save -t -n src src
-    force-delete src-restore
-    mkdir src-restore
+    WVPASS force-delete src-restore
+    WVPASS mkdir src-restore
     WVPASS bup restore -C src-restore "/src/latest$(pwd)/src/a/"
     WVPASS test -e src-restore/1
-    echo -n > hardlink-sets.expected
-    (cd src-restore && hardlink-sets .) > hardlink-sets.restored
+    WVPASS echo -n > hardlink-sets.expected
+    (WVPASS cd src-restore; WVPASS hardlink-sets .) > hardlink-sets.restored \
+        || exit $?
     WVPASS diff -u hardlink-sets.expected hardlink-sets.restored
 
     # Test that we do link within separate sub-trees.
-    setup-hardlink-test
-    cd "$TOP/bupmeta.tmp"
-    mkdir src/a src/b
-    touch src/a/1
-    ln src/a/1 src/b/1
+    WVPASS setup-hardlink-test
+    WVPASS cd "$tmpdir"
+    WVPASS mkdir src/a src/b
+    WVPASS touch src/a/1
+    WVPASS ln src/a/1 src/b/1
     WVPASS bup index -vv src/a src/b
     WVPASS bup save -t -n src src/a src/b
-    hardlink-test-run-restore
-    echo ./src/a/1 > hardlink-sets.expected
-    echo ./src/b/1 >> hardlink-sets.expected
-    (cd src-restore && hardlink-sets .) > hardlink-sets.restored
+    WVPASS hardlink-test-run-restore
+    WVPASS echo ./src/a/1 > hardlink-sets.expected
+    WVPASS echo ./src/b/1 >> hardlink-sets.expected
+    (WVPASS cd src-restore; WVPASS hardlink-sets .) > hardlink-sets.restored \
+        || exit $?
     WVPASS diff -u hardlink-sets.expected hardlink-sets.restored
-)
+
+    WVPASS rm -r "$tmpdir"
+
+) || exit $?
 
 WVSTART 'meta --edit'
 (
-    force-delete "$TOP/bupmeta.tmp"
-    mkdir "$TOP/bupmeta.tmp"
-    cd "$TOP/bupmeta.tmp"
-    mkdir src
+    tmpdir="$(WVPASS wvmktempdir)" || exit $?    
+    WVPASS cd "$tmpdir"
+    WVPASS mkdir src
+
     WVPASS bup meta -cf src.meta src
 
     WVPASS bup meta --edit --set-uid 0 src.meta | WVPASS bup meta -tvvf - \
@@ -370,298 +407,375 @@ WVSTART 'meta --edit'
         | WVPASS bup meta -tvvf - | WVPASS grep -qE '^group:'
     WVPASS bup meta --edit --unset-group --set-group bar src.meta \
         | WVPASS bup meta -tvvf - | grep -qE '^group: bar'
-)
+
+    WVPASS rm -r "$tmpdir"
+
+) || exit $?
+
+WVSTART 'meta --no-recurse'
+(
+    tmpdir="$(WVPASS wvmktempdir)" || exit $?    
+    WVPASS cd "$tmpdir"
+    WVPASS mkdir src
+    WVPASS mkdir src/foo
+    WVPASS touch src/foo/{1,2,3}
+    WVPASS bup meta -cf src.meta src
+    WVPASSEQ "$(bup meta -tf src.meta | LC_ALL=C sort)" "src/
+src/foo/
+src/foo/1
+src/foo/2
+src/foo/3"
+    WVPASS bup meta --no-recurse -cf src.meta src
+    WVPASSEQ "$(bup meta -tf src.meta | LC_ALL=C sort)" "src/"
+    WVPASS rm -r "$tmpdir"
+) || exit $?
 
 # Test ownership restoration (when not root or fakeroot).
 (
-    if test "$(whoami)" == root; then
+    if [ "$root_status" != none ]; then
         exit 0
     fi
 
+    tmpdir="$(WVPASS wvmktempdir)" || exit $?    
+
+    # FIXME: binary groups
+    first_group="$(WVPASS bup-python -c 'import os,grp; \
+      print(grp.getgrgid(os.getgroups()[0])[0])')" || exit $?
+    last_group="$(bup-python -c 'import os,grp; \
+      print(grp.getgrgid(os.getgroups()[-1])[0])')" || exit $?
+    last_group_erx="$(escape-erx "$last_group")"
+
     WVSTART 'metadata (restoration of ownership)'
-    force-delete "$TOP/bupmeta.tmp"
-    mkdir "$TOP/bupmeta.tmp"
-    cd "$TOP/bupmeta.tmp"
-    touch src
+    WVPASS cd "$tmpdir"
+    WVPASS touch src
+    # Some systems always assign the parent dir group to new paths
+    # (sgid).  Make sure the group is one we're in.
+    WVPASS chgrp -R "$first_group" src
+
     WVPASS bup meta -cf src.meta src
 
-    mkdir dest
-    cd dest
+    WVPASS mkdir dest
+    WVPASS cd dest
     # Make sure we don't change (or try to change) the user when not root.
     WVPASS bup meta --edit --set-user root ../src.meta | WVPASS bup meta -x
     WVPASS bup xstat src | WVPASS grep -qvE '^user: root'
-    rm -rf src
+    WVPASS rm -rf src
     WVPASS bup meta --edit --unset-user --set-uid 0 ../src.meta \
         | WVPASS bup meta -x
-    WVPASS bup xstat src | grep -qvE '^user: root'
+    WVPASS bup xstat src | WVPASS grep -qvE '^user: root'
 
     # Make sure we can restore one of the user's groups.
-    last_group="$(python -c 'import os,grp; \
-      print grp.getgrgid(os.getgroups()[0])[0]')"
-    rm -rf src
+    WVPASS rm -rf src
     WVPASS bup meta --edit --set-group "$last_group" ../src.meta \
         | WVPASS bup meta -x
-    WVPASS bup xstat src | WVPASS grep -qE "^group: $last_group"
+    WVPASS bup xstat src | WVPASS grep -qE "^group: $last_group_erx"
 
     # Make sure we can restore one of the user's gids.
-    user_gids="$(id -G)"
-    last_gid="$(echo ${user_gids/* /})"
-    rm -rf src
+    user_gids="$(id -G)" || exit $?
+    last_gid="$(echo ${user_gids/* /})" || exit $?
+    WVPASS rm -rf src
     WVPASS bup meta --edit --unset-group --set-gid "$last_gid" ../src.meta \
         | WVPASS bup meta -x
     WVPASS bup xstat src | WVPASS grep -qE "^gid: $last_gid"
 
     # Test --numeric-ids (gid).
-    rm -rf src
-    current_gidx=$(bup meta -tvvf ../src.meta | grep -e '^gid:')
+    WVPASS rm -rf src
+    current_gidx=$(bup meta -tvvf ../src.meta | grep -e '^gid:') || exit $?
     WVPASS bup meta --edit --set-group "$last_group" ../src.meta \
         | WVPASS bup meta -x --numeric-ids
-    new_gidx=$(bup xstat src | grep -e '^gid:')
+    new_gidx=$(bup xstat src | grep -e '^gid:') || exit $?
     WVPASSEQ "$current_gidx" "$new_gidx"
 
     # Test that restoring an unknown user works.
-    unknown_user=$("$TOP"/t/unknown-owner --user)
-    rm -rf src
-    current_uidx=$(bup meta -tvvf ../src.meta | grep -e '^uid:')
+    unknown_user=$("$TOP"/t/unknown-owner --user) || exit $?
+    WVPASS rm -rf src
+    current_uidx=$(bup meta -tvvf ../src.meta | grep -e '^uid:') || exit $?
     WVPASS bup meta --edit --set-user "$unknown_user" ../src.meta \
         | WVPASS bup meta -x
-    new_uidx=$(bup xstat src | grep -e '^uid:')
+    new_uidx=$(bup xstat src | grep -e '^uid:') || exit $?
     WVPASSEQ "$current_uidx" "$new_uidx"
 
     # Test that restoring an unknown group works.
-    unknown_group=$("$TOP"/t/unknown-owner --group)
-    rm -rf src
-    current_gidx=$(bup meta -tvvf ../src.meta | grep -e '^gid:')
+    unknown_group=$("$TOP"/t/unknown-owner --group) || exit $?
+    WVPASS rm -rf src
+    current_gidx=$(bup meta -tvvf ../src.meta | grep -e '^gid:') || exit $?
     WVPASS bup meta --edit --set-group "$unknown_group" ../src.meta \
         | WVPASS bup meta -x
-    new_gidx=$(bup xstat src | grep -e '^gid:')
+    new_gidx=$(bup xstat src | grep -e '^gid:') || exit $?
     WVPASSEQ "$current_gidx" "$new_gidx"
-)
+
+    WVPASS rm -r "$tmpdir"
+
+) || exit $?
 
 # Test ownership restoration (when root or fakeroot).
 (
-    if test "$(whoami)" != root; then
+    if [ "$root_status" = none ]; then
         exit 0
     fi
 
+    tmpdir="$(WVPASS wvmktempdir)" || exit $?    
+
+    uid=$(WVPASS id -un) || exit $?
+    gid=$(WVPASS id -gn) || exit $?
+
     WVSTART 'metadata (restoration of ownership as root)'
-    force-delete "$TOP/bupmeta.tmp"
-    mkdir "$TOP/bupmeta.tmp"
-    cd "$TOP/bupmeta.tmp"
-    touch src
-    chown 0:0 src # In case the parent dir is sgid, etc.
+    WVPASS cd "$tmpdir"
+    WVPASS touch src
+    WVPASS chown "$uid:$gid" src # In case the parent dir is sgid, etc.
     WVPASS bup meta -cf src.meta src
 
-    mkdir dest
-    chmod 700 dest # so we can't accidentally do something insecure
-    cd dest
+    WVPASS mkdir dest
+    WVPASS chmod 700 dest # so we can't accidentally do something insecure
+    WVPASS cd dest
+
+    other_uinfo="$(id-other-than --user "$uid")" || exit $?
+    other_user="${other_uinfo%%:*}"
+    other_uid="${other_uinfo##*:}"
+
+    other_ginfo="$(id-other-than --group "$gid")" || exit $?
+    other_group="${other_ginfo%%:*}"
+    other_gid="${other_ginfo##*:}"
 
-    # Make sure we can restore a uid.
-    WVPASS bup meta --edit --unset-user --set-uid 42 ../src.meta \
+    # Make sure we can restore a uid (must be in /etc/passwd b/c cygwin).
+    WVPASS bup meta --edit --unset-user --set-uid "$other_uid" ../src.meta \
         | WVPASS bup meta -x
-    WVPASS bup xstat src | WVPASS grep -qE '^uid: 42'
+    WVPASS bup xstat src | WVPASS grep -qE "^uid: $other_uid"
 
-    # Make sure we can restore a gid.
-    WVPASS bup meta --edit --unset-group --set-gid 42 ../src.meta \
+    # Make sure we can restore a gid (must be in /etc/group b/c cygwin).
+    WVPASS bup meta --edit --unset-group --set-gid "$other_gid" ../src.meta \
         | WVPASS bup meta -x
-    WVPASS bup xstat src | WVPASS grep -qE '^gid: 42'
+    WVPASS bup xstat src | WVPASS grep -qE "^gid: $other_gid"
 
-    some_user=$("$TOP"/t/some-owner --user)
-    some_group=$("$TOP"/t/some-owner --group)
+    other_uinfo2="$(id-other-than --user "$(id -un)" "$other_user")" || exit $?
+    other_user2="${other_uinfo2%%:*}"
+    other_user2_erx="$(escape-erx "$other_user2")" || exit $?
+    other_uid2="${other_uinfo2##*:}"
+
+    other_ginfo2="$(id-other-than --group "$(id -gn)" "$other_group")" || exit $?
+    other_group2="${other_ginfo2%%:*}"
+    other_group2_erx="$(escape-erx "$other_group2")" || exit $?
+    other_gid2="${other_ginfo2##*:}"
 
     # Try to restore a user (and see that user trumps uid when uid is not 0).
-    WVPASS bup meta --edit --set-uid 42 --set-user "$some_user" ../src.meta \
+    WVPASS bup meta --edit \
+        --set-uid "$other_uid" --set-user "$other_user2" ../src.meta \
         | WVPASS bup meta -x
-    WVPASS bup xstat src | WVPASS grep -qE "^user: $some_user"
+    WVPASS bup xstat src | WVPASS grep -qE "^user: $other_user2_erx"
 
     # Try to restore a group (and see that group trumps gid when gid is not 0).
-    WVPASS bup meta --edit --set-gid 42 --set-group "$some_group" ../src.meta \
-        | WVPASS bup meta -x
-    WVPASS bup xstat src | WVPASS grep -qE "^group: $some_user"
-
-    # Make sure a uid of 0 trumps a non-root user.
-    WVPASS bup meta --edit --set-user "$some_user" ../src.meta \
+    WVPASS bup meta --edit \
+        --set-gid "$other_gid" --set-group "$other_group2" ../src.meta \
         | WVPASS bup meta -x
-    WVPASS bup xstat src | WVPASS grep -qvE "^user: $some_user"
-    WVPASS bup xstat src | WVPASS grep -qE "^uid: 0"
+    WVPASS bup xstat src | WVPASS grep -qE "^group: $other_group2_erx"
 
-    # Make sure a gid of 0 trumps a non-root group.
-    WVPASS bup meta --edit --set-group "$some_user" ../src.meta \
-        | WVPASS bup meta -x
-    WVPASS bup xstat src | WVPASS grep -qvE "^group: $some_group"
-    WVPASS bup xstat src | WVPASS grep -qE "^gid: 0"
+    # Test --numeric-ids (uid).  Note the name 'root' is not handled
+    # specially, so we use that here as the test user name.  We assume
+    # that the root user's uid is never 42.
+    WVPASS rm -rf src
+    WVPASS bup meta --edit --set-user root --set-uid "$other_uid" ../src.meta \
+        | WVPASS bup meta -x --numeric-ids
+    new_uidx=$(bup xstat src | grep -e '^uid:') || exit $?
+    WVPASSEQ "$new_uidx" "uid: $other_uid"
 
     # Test --numeric-ids (gid).  Note the name 'root' is not handled
     # specially, so we use that here as the test group name.  We
     # assume that the root group's gid is never 42.
-    rm -rf src
-    WVPASS bup meta --edit --set-group root --set-gid 42 ../src.meta \
+    WVPASS rm -rf src
+    WVPASS bup meta --edit --set-group root --set-gid "$other_gid" ../src.meta \
         | WVPASS bup meta -x --numeric-ids
-    new_gidx=$(bup xstat src | grep -e '^gid:')
-    WVPASSEQ "$new_gidx" 'gid: 42'
-
-    # Test --numeric-ids (uid).  Note the name 'root' is not handled
-    # specially, so we use that here as the test user name.  We assume
-    # that the root user's uid is never 42.
-    rm -rf src
-    WVPASS bup meta --edit --set-user root --set-uid 42 ../src.meta \
-        | WVPASS bup meta -x --numeric-ids
-    new_uidx=$(bup xstat src | grep -e '^uid:')
-    WVPASSEQ "$new_uidx" 'uid: 42'
+    new_gidx=$(bup xstat src | grep -e '^gid:') || exit $?
+    WVPASSEQ "$new_gidx" "gid: $other_gid"
 
     # Test that restoring an unknown user works.
-    unknown_user=$("$TOP"/t/unknown-owners --user)
-    rm -rf src
-    WVPASS bup meta --edit --set-uid 42 --set-user "$unknown_user" ../src.meta \
+    unknown_user=$("$TOP"/t/unknown-owner --user) || exit $?
+    WVPASS rm -rf src
+    WVPASS bup meta --edit \
+        --set-uid "$other_uid" --set-user "$unknown_user" ../src.meta \
         | WVPASS bup meta -x
-    new_uidx=$(bup xstat src | grep -e '^uid:')
-    WVPASSEQ "$new_uidx" 'uid: 42'
+    new_uidx=$(bup xstat src | grep -e '^uid:') || exit $?
+    WVPASSEQ "$new_uidx" "uid: $other_uid"
 
     # Test that restoring an unknown group works.
-    unknown_group=$("$TOP"/t/unknown-owners --group)
-    rm -rf src
+    unknown_group=$("$TOP"/t/unknown-owner --group) || exit $?
+    WVPASS rm -rf src
     WVPASS bup meta --edit \
-        --set-gid 42 --set-group "$unknown_group" ../src.meta \
+        --set-gid "$other_gid" --set-group "$unknown_group" ../src.meta \
         | WVPASS bup meta -x
-    new_gidx=$(bup xstat src | grep -e '^gid:')
-    WVPASSEQ "$new_gidx" 'gid: 42'
-)
+    new_gidx=$(bup xstat src | grep -e '^gid:') || exit $?
+    WVPASSEQ "$new_gidx" "gid: $other_gid"
+
+    if ! [[ $(uname) =~ CYGWIN ]]; then
+        # For now, skip these on Cygwin because it doesn't allow
+        # restoring an unknown uid/gid.
+
+        # Make sure a uid of 0 trumps a non-root user.
+        WVPASS bup meta --edit --set-user "$other_user2" ../src.meta \
+            | WVPASS bup meta -x
+        WVPASS bup xstat src | WVPASS grep -qvE "^user: $other_user2_erx"
+        WVPASS bup xstat src | WVPASS grep -qE "^uid: 0"
+
+        # Make sure a gid of 0 trumps a non-root group.
+        WVPASS bup meta --edit --set-group "$other_group2" ../src.meta \
+            | WVPASS bup meta -x
+        WVPASS bup xstat src | WVPASS grep -qvE "^group: $other_group2_erx"
+        WVPASS bup xstat src | WVPASS grep -qE "^gid: 0"
+    fi
+
+    WVPASS rm -r "$tmpdir"
+
+) || exit $?
+
 
 # Root-only tests that require an FS with all the trimmings: ACLs,
 # Linux attr, Linux xattr, etc.
-if actually-root; then
+if [ "$root_status" = root ]; then
     (
-        set -e
         # Some cleanup handled in universal-cleanup() above.
         # These tests are only likely to work under Linux for now
         # (patches welcome).
         [[ $(uname) =~ Linux ]] || exit 0
 
+        if ! modprobe loop; then
+            echo 'Unable to load loopback module; skipping dependent tests.' 1>&2
+            exit 0
+        fi
+
+        testfs="$(WVPASS wvmkmountpt)" || exit $?
+        testfs_limited="$(WVPASS wvmkmountpt)" || exit $?
+        tmpdir="$(WVPASS wvmktempdir)" || exit $?
+        export BUP_DIR="$tmpdir/bup"
+
         WVSTART 'meta - general (as root)'
-        setup-test-tree
-        cd "$TOP/bupmeta.tmp"
-
-        umount testfs || true
-        dd if=/dev/zero of=testfs.img bs=1M count=32
-        mke2fs -F -j -m 0 testfs.img
-        mkdir testfs
-        mount -o loop,acl,user_xattr testfs.img testfs
+        WVPASS setup-test-tree
+        WVPASS cd "$tmpdir"
+
+        umount "$testfs"
+        WVPASS dd if=/dev/zero of=testfs.img bs=1M count=32
+        # Make sure we have all the options the chattr test needs
+        # (i.e. create a "normal" ext4 filesystem).
+        WVPASS mke2fs -F -m 0 \
+            -I 256 \
+            -O has_journal,extent,huge_file,flex_bg,uninit_bg,dir_nlink,extra_isize \
+            testfs.img
+        WVPASS mount -o loop,acl,user_xattr testfs.img "$testfs"
         # Hide, so that tests can't create risks.
-        chown root:root testfs
-        chmod 0700 testfs
+        WVPASS chown root:root "$testfs"
+        WVPASS chmod 0700 "$testfs"
 
-        umount testfs-limited || true
-        dd if=/dev/zero of=testfs-limited.img bs=1M count=32
-        mkfs -t vfat testfs-limited.img
-        mkdir testfs-limited
-        mount -o loop,uid=root,gid=root,umask=0077 \
-            testfs-limited.img testfs-limited
+        umount "$testfs_limited"
+        WVPASS dd if=/dev/zero of=testfs-limited.img bs=1M count=32
+        WVPASS mkfs -t vfat testfs-limited.img
+        WVPASS mount -o loop,uid=root,gid=root,umask=0077 \
+            testfs-limited.img "$testfs_limited"
 
-        #cp -a src testfs/src
-        cp -pPR src testfs/src
-        (cd testfs && test-src-create-extract)
+        WVPASS cp -pPR src "$testfs"/src
+        (WVPASS cd "$testfs"; WVPASS test-src-create-extract) || exit $?
 
         WVSTART 'meta - atime (as root)'
-        force-delete testfs/src
-        mkdir testfs/src
+        WVPASS force-delete "$testfs"/src
+        WVPASS mkdir "$testfs"/src
         (
-            mkdir testfs/src/foo
-            touch testfs/src/bar
-            PYTHONPATH="$TOP/lib" \
-                python -c "from bup import xstat; \
+            WVPASS mkdir "$testfs"/src/foo
+            WVPASS touch "$testfs"/src/bar
+            WVPASS bup-python -c "from bup import xstat; \
                 x = xstat.timespec_to_nsecs((42, 0));\
-                   xstat.utime('testfs/src/foo', (x, x));\
-                   xstat.utime('testfs/src/bar', (x, x));"
-            cd testfs
+                xstat.utime(b'$testfs/src/foo', (x, x));\
+                xstat.utime(b'$testfs/src/bar', (x, x));"
+            WVPASS cd "$testfs"
             WVPASS bup meta -v --create --recurse --file src.meta src
-            bup meta -tvf src.meta
+            WVPASS bup meta -tvf src.meta
             # Test extract.
-            force-delete src-restore
-            mkdir src-restore
-            cd src-restore
+            WVPASS force-delete src-restore
+            WVPASS mkdir src-restore
+            WVPASS cd src-restore
             WVPASS bup meta --extract --file ../src.meta
             WVPASSEQ "$(bup xstat --include-fields=atime src/foo)" "atime: 42"
             WVPASSEQ "$(bup xstat --include-fields=atime src/bar)" "atime: 42"
             # Test start/finish extract.
-            force-delete src
+            WVPASS force-delete src
             WVPASS bup meta --start-extract --file ../src.meta
             WVPASS test -d src
             WVPASS bup meta --finish-extract --file ../src.meta
             WVPASSEQ "$(bup xstat --include-fields=atime src/foo)" "atime: 42"
             WVPASSEQ "$(bup xstat --include-fields=atime src/bar)" "atime: 42"
-        )
+        ) || exit $?
 
         WVSTART 'meta - Linux attr (as root)'
-        force-delete testfs/src
-        mkdir testfs/src
+        WVPASS force-delete "$testfs"/src
+        WVPASS mkdir "$testfs"/src
         (
-            touch testfs/src/foo
-            mkdir testfs/src/bar
-            chattr +acdeijstuADST testfs/src/foo
-            chattr +acdeijstuADST testfs/src/bar
-            (cd testfs && test-src-create-extract)
+            WVPASS touch "$testfs"/src/foo
+            WVPASS mkdir "$testfs"/src/bar
+            WVPASS chattr +acdeijstuADS "$testfs"/src/foo
+            WVPASS chattr +acdeijstuADST "$testfs"/src/bar
+            (WVPASS cd "$testfs"; WVPASS test-src-create-extract) || exit $?
             # Test restoration to a limited filesystem (vfat).
             (
-                WVPASS bup meta --create --recurse --file testfs/src.meta \
-                    testfs/src
-                force-delete testfs-limited/src-restore
-                mkdir testfs-limited/src-restore
-                cd testfs-limited/src-restore
-                WVFAIL bup meta --extract --file ../../testfs/src.meta 2>&1 \
+                WVPASS bup meta --create --recurse --file "$testfs"/src.meta \
+                    "$testfs"/src
+                WVPASS force-delete "$testfs_limited"/src-restore
+                WVPASS mkdir "$testfs_limited"/src-restore
+                WVPASS cd "$testfs_limited"/src-restore
+                WVFAIL bup meta --extract --file "$testfs"/src.meta 2>&1 \
                     | WVPASS grep -e '^Linux chattr:' \
-                    | WVPASS python -c \
-                      'import sys; exit(not len(sys.stdin.readlines()) == 2)'
-            )
-        )
+                    | WVPASS bup-python -c \
+                    'import sys; exit(not len(sys.stdin.readlines()) == 3)'
+            ) || exit $?
+        ) || exit $?
 
         WVSTART 'meta - Linux xattr (as root)'
-        force-delete testfs/src
-        mkdir testfs/src
+        WVPASS force-delete "$testfs"/src
+        WVPASS mkdir "$testfs"/src
+        WVPASS touch "$testfs"/src/foo
+        WVPASS mkdir "$testfs"/src/bar
+        WVPASS attr -s foo -V bar "$testfs"/src/foo
+        WVPASS attr -s foo -V bar "$testfs"/src/bar
+        (WVPASS cd "$testfs"; WVPASS test-src-create-extract) || exit $?
+
+        # Test restoration to a limited filesystem (vfat).
         (
-            touch testfs/src/foo
-            mkdir testfs/src/bar
-            attr -s foo -V bar testfs/src/foo
-            attr -s foo -V bar testfs/src/bar
-            (cd testfs && test-src-create-extract)
-
-            # Test restoration to a limited filesystem (vfat).
-            (
-                WVPASS bup meta --create --recurse --file testfs/src.meta \
-                    testfs/src
-                force-delete testfs-limited/src-restore
-                mkdir testfs-limited/src-restore
-                cd testfs-limited/src-restore
-                WVFAIL bup meta --extract --file ../../testfs/src.meta 2>&1 \
-                    | WVPASS grep -e '^xattr\.set:' \
-                    | WVPASS python -c \
-                      'import sys; exit(not len(sys.stdin.readlines()) == 2)'
-            )
-        )
+            WVPASS bup meta --create --recurse --file "$testfs"/src.meta \
+                "$testfs"/src
+            WVPASS force-delete "$testfs_limited"/src-restore
+            WVPASS mkdir "$testfs_limited"/src-restore
+            WVPASS cd "$testfs_limited"/src-restore
+            WVFAIL bup meta --extract --file "$testfs"/src.meta
+            WVFAIL bup meta --extract --file "$testfs"/src.meta 2>&1 \
+                | WVPASS grep -e "^xattr\.set u\?'" \
+                | WVPASS bup-python -c \
+                'import sys; exit(not len(sys.stdin.readlines()) == 2)'
+        ) || exit $?
 
         WVSTART 'meta - POSIX.1e ACLs (as root)'
-        force-delete testfs/src
-        mkdir testfs/src
+        WVPASS force-delete "$testfs"/src
+        WVPASS mkdir "$testfs"/src
+        WVPASS touch "$testfs"/src/foo
+        WVPASS mkdir "$testfs"/src/bar
+        WVPASS setfacl -m u:root:r "$testfs"/src/foo
+        WVPASS setfacl -m u:root:r "$testfs"/src/bar
+        (WVPASS cd "$testfs"; WVPASS test-src-create-extract) || exit $?
+
+        # Test restoration to a limited filesystem (vfat).
         (
-            touch testfs/src/foo
-            mkdir testfs/src/bar
-            setfacl -m u:root:r testfs/src/foo
-            setfacl -m u:root:r testfs/src/bar
-            (cd testfs && test-src-create-extract)
-
-            # Test restoration to a limited filesystem (vfat).
-            (
-                WVPASS bup meta --create --recurse --file testfs/src.meta \
-                    testfs/src
-                force-delete testfs-limited/src-restore
-                mkdir testfs-limited/src-restore
-                cd testfs-limited/src-restore
-                WVFAIL bup meta --extract --file ../../testfs/src.meta 2>&1 \
-                    | WVPASS grep -e '^POSIX1e ACL applyto:' \
-                    | WVPASS python -c \
-                      'import sys; exit(not len(sys.stdin.readlines()) == 2)'
-            )
-        )
-    )
+            WVPASS bup meta --create --recurse --file "$testfs"/src.meta \
+                "$testfs"/src
+            WVPASS force-delete "$testfs_limited"/src-restore
+            WVPASS mkdir "$testfs_limited"/src-restore
+            WVPASS cd "$testfs_limited"/src-restore
+            WVFAIL bup meta --extract --file "$testfs"/src.meta 2>&1 \
+                | WVPASS grep -e '^POSIX1e ACL applyto:' \
+                | WVPASS bup-python -c \
+                'import sys; exit(not len(sys.stdin.readlines()) == 2)'
+        ) || exit $?
+
+        WVPASS umount "$testfs"
+        WVPASS umount "$testfs_limited"
+        WVPASS rm -r "$testfs" "$testfs_limited"
+
+        WVPASS rm -r "$tmpdir"
+
+    ) || exit $?
 fi
 
-exit 0
+WVPASS rm -r "$tmpdir"