From 53ae6525b93d4455e67d6904ee53cc9e4b2a2b02 Mon Sep 17 00:00:00 2001
From: David Sterba <dsterba@suse.com>
Date: Tue, 2 Jul 2019 13:44:02 +0200
Subject: [PATCH] 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>
---
 tests/common         | 8 ++++----
 tests/common.convert | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/common b/tests/common
index 0859bc82..55ef442f 100644
--- a/tests/common
+++ b/tests/common
@@ -563,7 +563,7 @@ generate_dataset() {
 		small)
 			for num in $(seq 1 "$DATASET_SIZE"); do
 				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
 			;;
 
@@ -602,10 +602,10 @@ generate_dataset() {
 		sparse)
 			for num in $(seq 1 "$DATASET_SIZE"); do
 				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 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"
 			done
 			;;
@@ -633,7 +633,7 @@ generate_dataset() {
 			;;
 		large)
 			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
 }
diff --git a/tests/common.convert b/tests/common.convert
index 1be804cf..f24ceb0d 100644
--- a/tests/common.convert
+++ b/tests/common.convert
@@ -88,7 +88,7 @@ convert_test_prep_fs() {
 	# create a file inside the fs before convert, to make sure there is
 	# data covering btrfs backup superblock range (64M)
 	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
@@ -97,7 +97,7 @@ convert_test_gen_checksums() {
 	_assert_path "$1"
 
 	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"
 }
 # list $TEST_MNT data set file permissions.
@@ -110,7 +110,7 @@ convert_test_perm() {
 	FILES_LIST=$(mktemp --tmpdir btrfs-progs-convert.fileslistXXXXXX)
 
 	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"
 	# Fix directory entries order
 	sort "$FILES_LIST" -o "$FILES_LIST"