marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

btrfs-progs: tests: don't print dd transfer info 

The transfer lines from dd bloat the logs and other lines may not fit.
Disable xfer in all dd commands but still allow errors to be caught.

Signed-off-by: David Sterba <dsterba@suse.com>
master
David Sterba 2019-07-02 13:44:02 +02:00
parent 201ad5c9e5
commit 53ae6525b9
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/common
View File

@ -563,7 +563,7 @@ generate_dataset() {
small) small)
for num in $(seq 1 "$DATASET_SIZE"); do for num in $(seq 1 "$DATASET_SIZE"); do
run_check $SUDO_HELPER dd if=/dev/urandom of="$dirpath/$dataset_type.$num" bs=10K \ run_check $SUDO_HELPER dd if=/dev/urandom of="$dirpath/$dataset_type.$num" bs=10K \
count=1 >/dev/null 2>&1 count=1 status=noxfer >/dev/null 2>&1
done done
;; ;;
@ -602,10 +602,10 @@ generate_dataset() {
sparse) sparse)
for num in $(seq 1 "$DATASET_SIZE"); do for num in $(seq 1 "$DATASET_SIZE"); do
run_check $SUDO_HELPER dd if=/dev/urandom of="$dirpath/$dataset_type.$num" bs=10K \ run_check $SUDO_HELPER dd if=/dev/urandom of="$dirpath/$dataset_type.$num" bs=10K \
count=1 >/dev/null 2>&1 count=1 status=noxfer >/dev/null 2>&1
run_check $SUDO_HELPER truncate -s 500K "$dirpath/$dataset_type.$num" run_check $SUDO_HELPER truncate -s 500K "$dirpath/$dataset_type.$num"
run_check $SUDO_HELPER dd if=/dev/urandom of="$dirpath/$dataset_type.$num" bs=10K \ run_check $SUDO_HELPER dd if=/dev/urandom of="$dirpath/$dataset_type.$num" bs=10K \
oflag=append conv=notrunc count=1 >/dev/null 2>&1 oflag=append conv=notrunc count=1 status=noxfer >/dev/null 2>&1
run_check $SUDO_HELPER truncate -s 800K "$dirpath/$dataset_type.$num" run_check $SUDO_HELPER truncate -s 800K "$dirpath/$dataset_type.$num"
done done
;; ;;
@ -633,7 +633,7 @@ generate_dataset() {
;; ;;
large) large)
run_check $SUDO_HELPER dd if=/dev/urandom bs=32M count=1 \ run_check $SUDO_HELPER dd if=/dev/urandom bs=32M count=1 \
of="$dirpath/$dataset_type" >/dev/null 2>&1 of="$dirpath/$dataset_type" status=noxfer >/dev/null 2>&1
;; ;;
esac esac
} }

6
tests/common.convert
View File

@ -88,7 +88,7 @@ convert_test_prep_fs() {
# create a file inside the fs before convert, to make sure there is # create a file inside the fs before convert, to make sure there is
# data covering btrfs backup superblock range (64M) # data covering btrfs backup superblock range (64M)
run_check $SUDO_HELPER dd if=/dev/zero bs=1M count=64 \ run_check $SUDO_HELPER dd if=/dev/zero bs=1M count=64 \
of="$TEST_MNT/convert_space_holder" of="$TEST_MNT/convert_space_holder" status=noxfer
} }
# generate md5 checksums of files on $TEST_MNT # generate md5 checksums of files on $TEST_MNT
@ -97,7 +97,7 @@ convert_test_gen_checksums() {
_assert_path "$1" _assert_path "$1"
run_check $SUDO_HELPER dd if=/dev/zero of="$TEST_MNT/test" "bs=$nodesize" \ run_check $SUDO_HELPER dd if=/dev/zero of="$TEST_MNT/test" "bs=$nodesize" \
count=1 >/dev/null 2>&1 count=1 status=noxfer >/dev/null 2>&1
run_check_stdout $SUDO_HELPER find "$TEST_MNT" -type f ! -name 'image' -exec md5sum {} \+ > "$1" run_check_stdout $SUDO_HELPER find "$TEST_MNT" -type f ! -name 'image' -exec md5sum {} \+ > "$1"
} }
# list $TEST_MNT data set file permissions. # list $TEST_MNT data set file permissions.
@ -110,7 +110,7 @@ convert_test_perm() {
FILES_LIST=$(mktemp --tmpdir btrfs-progs-convert.fileslistXXXXXX) FILES_LIST=$(mktemp --tmpdir btrfs-progs-convert.fileslistXXXXXX)
run_check $SUDO_HELPER dd if=/dev/zero of="$TEST_MNT/test" "bs=$nodesize" \ run_check $SUDO_HELPER dd if=/dev/zero of="$TEST_MNT/test" "bs=$nodesize" \
count=1 >/dev/null 2>&1 count=1 status=noxfer >/dev/null 2>&1
run_check_stdout $SUDO_HELPER find "$TEST_MNT" -type f ! -name 'image' -fprint "$FILES_LIST" run_check_stdout $SUDO_HELPER find "$TEST_MNT" -type f ! -name 'image' -fprint "$FILES_LIST"
# Fix directory entries order # Fix directory entries order
sort "$FILES_LIST" -o "$FILES_LIST" sort "$FILES_LIST" -o "$FILES_LIST"