midx-cmd: accommodate python 3

[bup.git] / t / test-sparse-files.sh

diff --git a/t/test-sparse-files.sh b/t/test-sparse-files.sh
index 54ecb8268b5602947e6fc5d7bfb87d5919aa645c..40d25d02696659988625270b87ac746da27eb78a 100755 (executable)
--- a/t/test-sparse-files.sh
+++ b/t/test-sparse-files.sh
@@ -42,21 +42,21 @@ WVPASS bup save -n src src
 
 WVSTART "sparse file restore (all sparse)"
 WVPASS bup restore -C restore "src/latest/$(pwd)/"
-restore_size=$(WVPASS du -k -s restore | WVPASS cut -f1) || exit $?
+restore_size=$(WVPASS du -k -s restore/src/foo | WVPASS cut -f1) || exit $?
 WVPASS [ "$restore_size" -ge "$((data_size / 1024))" ]
 WVPASS "$top/t/compare-trees" -c src/ restore/src/
 
 WVSTART "sparse file restore --no-sparse (all sparse)"
 WVPASS rm -r restore
 WVPASS bup restore --no-sparse -C restore "src/latest/$(pwd)/"
-restore_size=$(WVPASS du -k -s restore | WVPASS cut -f1) || exit $?
+restore_size=$(WVPASS du -k -s restore/src/foo | WVPASS cut -f1) || exit $?
 WVPASS [ "$restore_size" -ge "$((data_size / 1024))" ]
 WVPASS "$top/t/compare-trees" -c src/ restore/src/
 
 WVSTART "sparse file restore --sparse (all sparse)"
 WVPASS rm -r restore
 WVPASS bup restore --sparse -C restore "src/latest/$(pwd)/"
-restore_size=$(WVPASS du -k -s restore | WVPASS cut -f1) || exit $?
+restore_size=$(WVPASS du -k -s restore/src/foo | WVPASS cut -f1) || exit $?
 WVPASS [ "$restore_size" -le "$((3 * (block_size / 1024)))" ]
 WVPASS "$top/t/compare-trees" -c src/ restore/src/
 
@@ -67,7 +67,7 @@ WVPASS bup index src
 WVPASS bup save -n src src
 WVPASS rm -r restore
 WVPASS bup restore --sparse -C restore "src/latest/$(pwd)/"
-restore_size=$(WVPASS du -k -s restore | WVPASS cut -f1) || exit $?
+restore_size=$(WVPASS du -k -s restore/src/foo | WVPASS cut -f1) || exit $?
 WVPASS [ "$restore_size" -le "$((3 * (block_size / 1024)))" ]
 WVPASS "$top/t/compare-trees" -c src/ restore/src/
 
@@ -77,7 +77,7 @@ WVPASS bup index src
 WVPASS bup save -n src src
 WVPASS rm -r restore
 WVPASS bup restore --sparse -C restore "src/latest/$(pwd)/"
-restore_size=$(WVPASS du -k -s restore | WVPASS cut -f1) || exit $?
+restore_size=$(WVPASS du -k -s restore/src/foo | WVPASS cut -f1) || exit $?
 WVPASS [ "$restore_size" -le "$((5 * (block_size / 1024)))" ]
 WVPASS "$top/t/compare-trees" -c src/ restore/src/
 
@@ -98,7 +98,7 @@ WVPASS bup index src
 WVPASS bup save -n src src
 WVPASS rm -r restore
 WVPASS bup restore --sparse -C restore "src/latest/$(pwd)/"
-restore_size=$(WVPASS du -k -s restore | WVPASS cut -f1) || exit $?
+restore_size=$(WVPASS du -k -s restore/src/foo | WVPASS cut -f1) || exit $?
 WVPASS [ "$restore_size" -le "$((5 * (block_size / 1024)))" ]
 WVPASS "$top/t/compare-trees" -c src/ restore/src/
 
@@ -110,7 +110,7 @@ WVPASS bup index src
 WVPASS bup save -n src src
 WVPASS rm -r restore
 WVPASS bup restore --sparse -C restore "src/latest/$(pwd)/"
-restore_size=$(WVPASS du -k -s restore | WVPASS cut -f1) || exit $?
+restore_size=$(WVPASS du -k -s restore/src/foo | WVPASS cut -f1) || exit $?
 WVPASS [ "$restore_size" -le "$((5 * (block_size / 1024)))" ]
 WVPASS "$top/t/compare-trees" -c src/ restore/src/
 
@@ -141,5 +141,20 @@ WVPASS rm -r restore
 WVPASS bup restore --sparse -C restore "src/latest/$(pwd)/"
 WVPASS "$top/t/compare-trees" -c src/ restore/src/
 
+WVSTART "sparse file restore --sparse (short zero runs around boundary)"
+WVPASS bup-python > src/foo <<EOF
+from sys import stdout
+stdout.write("x" * 65535 + "\0")
+stdout.write("\0" + "x" * 65535)
+stdout.write("\0" + "x" * 65534 + "\0")
+stdout.write("x" * 65536)
+stdout.write("\0")
+EOF
+WVPASS bup index src
+WVPASS bup save -n src src
+WVPASS rm -r restore
+WVPASS bup restore --sparse -C restore "src/latest/$(pwd)/"
+WVPASS "$top/t/compare-trees" -c src/ restore/src/
+
 
 WVPASS rm -rf "$tmpdir"