X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=t%2Ftest-meta.sh;h=e3b79e39f2b109f786aa9829f5d09cda463ede4e;hb=ae9cde2e3df85569bf76487a9528080926841db5;hp=1170d71b3900fcd1f981847a667431329b93afa6;hpb=08808a1417e5df6e7f313e05435635ee65b2815f;p=bup.git diff --git a/t/test-meta.sh b/t/test-meta.sh index 1170d71..e3b79e3 100755 --- a/t/test-meta.sh +++ b/t/test-meta.sh @@ -171,8 +171,11 @@ WVSTART 'metadata save/restore (general)' # 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 - # Note: OS X rsync itemize output is currently only 9 chars, not 11. - expected_diff_rx='^\.d\.\.t.\.\.\.\.?\.? \./$' + # 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 @@ -674,11 +677,10 @@ if [ "$root_status" = root ]; then ( WVPASS mkdir "$testfs"/src/foo WVPASS touch "$testfs"/src/bar - PYTHONPATH="$TOP/lib" \ - WVPASS bup-python -c "from bup import xstat; \ + 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));" + xstat.utime('$testfs/src/foo', (x, x));\ + xstat.utime('$testfs/src/bar', (x, x));" WVPASS cd "$testfs" WVPASS bup meta -v --create --recurse --file src.meta src WVPASS bup meta -tvf src.meta @@ -704,7 +706,7 @@ if [ "$root_status" = root ]; then ( WVPASS touch "$testfs"/src/foo WVPASS mkdir "$testfs"/src/bar - WVPASS chattr +acdeijstuADST "$testfs"/src/foo + 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).