From 9b61668993720c08a0c56b68a435db687893bff2 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Mon, 26 Mar 2018 23:29:17 -0500 Subject: [PATCH] test-sparse-files: check sparse file size more carefully Test the actual sparse file with du, not the parent restore directory. Unnecessarily testing the whole tree broke the tests on a docker system because the directories themselves were large. Signed-off-by: Rob Browning Tested-by: Rob Browning --- t/test-sparse-files.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/t/test-sparse-files.sh b/t/test-sparse-files.sh index 45563a6..40d25d0 100755 --- 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/ -- 2.39.2