6 files changed, 56 insertions, 23 deletions
diff --git a/tests/bugs/distribute/bug-1099890.t b/tests/bugs/distribute/bug-1099890.t
index f48162c972b..40f70d4938b 100644
--- a/tests/bugs/distribute/bug-1099890.t
+++ b/tests/bugs/distribute/bug-1099890.t
@@ -10,6 +10,10 @@
 
 cleanup;
 
+QDD=$(dirname $0)/quota
+# compile the test write program and run it
+build_tester $(dirname $0)/../../basic/quota.c -o $QDD
+
 TEST   glusterd;
 TEST   pidof glusterd;
 
@@ -49,14 +53,14 @@ EXPECT "150M" echo `df -h $M0 -P | tail -1 | awk {'print $2'}`
 
 # Create a new file 'foo' under the root of the volume, which hashes to subvol-0
 # of DHT, that consumes 40M
-TEST   dd if=/dev/zero of=$M0/foo bs=5120k count=8
+TEST $QDD $M0/foo 256 160
 
 TEST   stat $B0/${V0}1/foo
 TEST ! stat $B0/${V0}2/foo
 
 # Create a new file 'bar' under the root of the volume, which hashes to subvol-1
 # of DHT, that consumes 40M
-TEST   dd if=/dev/zero of=$M0/bar bs=5120k count=8
+TEST $QDD $M0/bar 256 160
 
 TEST ! stat $B0/${V0}1/bar
 TEST   stat $B0/${V0}2/bar
@@ -84,7 +88,7 @@ TEST   touch $M0/empty1;
 # If this bug is fixed, then DHT should be routing the creation to subvol-1 only
 # as it has more than min-free-disk space available.
 
-TEST   dd if=/dev/zero of=$M0/file bs=1k count=1
+TEST $QDD $M0/file 1 1
 sleep 1;
 TEST ! stat $B0/${V0}1/file
 TEST   stat $B0/${V0}2/file
@@ -96,7 +100,7 @@ TEST touch $M0/empty2;
 
 # Now I create a new file that hashes to subvol-0, at the end of which, there
 # will be less than min-free-disk space available on it.
-TEST   dd if=/dev/zero of=$M0/fil bs=5120k count=4
+TEST $QDD $M0/fil 256 80
 sleep 1;
 TEST   stat $B0/${V0}1/fil
 TEST ! stat $B0/${V0}2/fil
@@ -108,7 +112,7 @@ TEST   touch $M0/empty3;
 # Now I create a file that hashes to subvol-0 but since it has less than
 # min-free-disk space available, its data will be cached on subvol-1.
 
-TEST   dd if=/dev/zero of=$M0/zz bs=5120k count=1
+TEST $QDD $M0/zz 256 20
 
 TEST   stat $B0/${V0}1/zz
 TEST   stat $B0/${V0}2/zz
@@ -123,4 +127,5 @@ EXPECT "1" get_aux
 UMOUNT_LOOP ${B0}/${V0}{1,2}
 rm -f ${B0}/brick{1,2}
 
+rm -f $QDD
 cleanup
diff --git a/tests/bugs/distribute/bug-1161156.t b/tests/bugs/distribute/bug-1161156.t
index cc9522dc1a8..bedbf74ec05 100755
--- a/tests/bugs/distribute/bug-1161156.t
+++ b/tests/bugs/distribute/bug-1161156.t
@@ -13,6 +13,10 @@ function usage()
 
 cleanup;
 
+QDD=$(dirname $0)/quota
+# compile the test write program and run it
+build_tester $(dirname $0)/../../basic/quota.c -o $QDD
+
 TEST glusterd
 TEST pidof glusterd
 TEST $CLI volume info;
@@ -30,7 +34,7 @@ mydir="dir"
 TEST mkdir -p $N0/$mydir
 TEST mkdir -p $N0/newdir
 
-TEST dd if=/dev/zero of=$N0/$mydir/file bs=1k count=10240
+TEST $QDD $N0/$mydir/file 256 40
 
 TEST $CLI volume quota $V0 enable
 TEST $CLI volume quota $V0 limit-usage / 20MB
@@ -38,10 +42,10 @@ TEST $CLI volume quota $V0 limit-usage /newdir 5MB
 TEST $CLI volume quota $V0 soft-timeout 0
 TEST $CLI volume quota $V0 hard-timeout 0
 
-TEST dd if=/dev/zero of=$N0/$mydir/newfile_1 bs=512 count=10240
+TEST $QDD $N0/$mydir/newfile_1 256 20
 # wait for write behind to complete.
 EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "15.0MB" usage "/"
-TEST ! dd if=/dev/zero of=$N0/$mydir/newfile_2 bs=1k count=10240 conv=fdatasync
+TEST ! $QDD $N0/$mydir/newfile_2 256 40
 
 # Test rename within a directory. It should pass even when the
 # corresponding directory quota is filled.
@@ -53,4 +57,7 @@ TEST ! mv $N0/dir/newfile_3 $N0/newdir/
 umount_nfs $N0
 TEST $CLI volume stop $V0
 EXPECT "1" get_aux
+
+rm -f $QDD
+
 cleanup;
diff --git a/tests/bugs/quota/bug-1023974.t b/tests/bugs/quota/bug-1023974.t
index 06b66bf35a3..2fb93320045 100644
--- a/tests/bugs/quota/bug-1023974.t
+++ b/tests/bugs/quota/bug-1023974.t
@@ -9,6 +9,10 @@
 
 cleanup;
 
+QDD=$(dirname $0)/quota
+# compile the test write program and run it
+build_tester $(dirname $0)/../../basic/quota.c -o $QDD
+
 TEST glusterd
 TEST pidof glusterd;
 TEST $CLI volume info;
@@ -26,13 +30,16 @@ TEST $CLI volume quota $V0 hard-timeout 0
 TEST $CLI volume quota $V0 soft-timeout 0
 
 #The corresponding write(3) should fail with EDQUOT ("Disk quota exceeded")
-TEST ! dd if=/dev/urandom of=$M0/1/2/file bs=1024k count=102;
+TEST ! $QDD $M0/1/2/file 256 408
 TEST mkdir -p $M0/1/3;
-TEST dd if=/dev/urandom of=$M0/1/3/file bs=1024k count=102;
+TEST $QDD $M0/1/3/file 256 408
 
 #The corresponding rename(3) should fail with EDQUOT ("Disk quota exceeded")
 TEST ! mv $M0/1/3/ $M0/1/2/3_mvd;
 
 TEST $CLI volume stop $V0
 EXPECT "1" get_aux
+
+rm -f $QDD
+
 cleanup;
diff --git a/tests/bugs/quota/bug-1038598.t b/tests/bugs/quota/bug-1038598.t
index d930a4f62e8..10fdb23424f 100644
--- a/tests/bugs/quota/bug-1038598.t
+++ b/tests/bugs/quota/bug-1038598.t
@@ -4,6 +4,10 @@
 
 cleanup;
 
+QDD=$(dirname $0)/quota
+# compile the test write program and run it
+build_tester $(dirname $0)/../../basic/quota.c -o $QDD
+
 TEST glusterd
 TEST pidof glusterd
 TEST $CLI volume info;
@@ -59,12 +63,12 @@ TEST $CLI volume quota $V0 limit-usage /test_dir 10MB 50
 EXPECT "10.0MB" hard_limit "/test_dir";
 EXPECT "50%" soft_limit "/test_dir";
 
-TEST dd if=/dev/zero of=$M0/test_dir/file1.txt bs=1024k count=4
+TEST $QDD $M0/test_dir/file1.txt 256 16
 EXPECT "4.0MB" usage "/test_dir";
 EXPECT 'No' sl_exceeded "/test_dir";
 EXPECT 'No' hl_exceeded "/test_dir";
 
-TEST dd if=/dev/zero of=$M0/test_dir/file1.txt bs=1024k count=6
+TEST $QDD $M0/test_dir/file1.txt 256 24
 EXPECT "6.0MB" usage "/test_dir";
 EXPECT 'Yes' sl_exceeded "/test_dir";
 EXPECT 'No' hl_exceeded "/test_dir";
@@ -73,10 +77,12 @@ EXPECT 'No' hl_exceeded "/test_dir";
 TEST $CLI volume set $V0 features.hard-timeout 0
 TEST $CLI volume set $V0 features.soft-timeout 0
 
-TEST ! dd if=/dev/zero of=$M0/test_dir/file1.txt bs=1024k count=15
+TEST ! $QDD $M0/test_dir/file1.txt 256 60
 EXPECT 'Yes' sl_exceeded "/test_dir";
 EXPECT 'Yes' hl_exceeded "/test_dir";
 TEST $CLI volume stop $V0
 EXPECT "1" get_aux
 
+rm -f $QDD
+
 cleanup;
diff --git a/tests/bugs/quota/bug-1087198.t b/tests/bugs/quota/bug-1087198.t
index 6eaae076fcc..44aa1b75e7a 100644
--- a/tests/bugs/quota/bug-1087198.t
+++ b/tests/bugs/quota/bug-1087198.t
@@ -19,6 +19,10 @@
 
 cleanup;
 
+QDD=$(dirname $0)/quota
+# compile the test write program and run it
+build_tester $(dirname $0)/../../basic/quota.c -o $QDD
+
 #1
 ## Step 1
 TEST glusterd
@@ -54,11 +58,11 @@ TEST $CLI volume quota $V0 limit-usage /$QUOTA_LIMIT_DIR 100KB
 
 #16
 ## Step 3 and 4
-TEST dd if=/dev/urandom of=$N0/$QUOTA_LIMIT_DIR/95KB_file bs=1k count=95
+TEST $QDD $N0/$QUOTA_LIMIT_DIR/95KB_file 1 95
 #Uncomment below TEST once the bug# 1202292 is fixed
 #TEST grep -e "\"Usage crossed soft limit:.*used by /$QUOTA_LIMIT_DIR\"" -- $BRICK_LOG_DIR/*
 
-TEST dd if=/dev/urandom of=$N0/100KB_file bs=1k count=100
+TEST $QDD $N0/100KB_file 1 100
 #Uncomment below TEST once the bug# 1202292 is fixed
 #TEST grep -e "\"Usage crossed soft limit:.*used by /\"" -- $BRICK_LOG_DIR/*
 
@@ -67,11 +71,11 @@ TEST dd if=/dev/urandom of=$N0/100KB_file bs=1k count=100
 TEST sleep 10
 
 ## Step 6
-TEST dd if=/dev/urandom of=$N0/$QUOTA_LIMIT_DIR/1KB_file bs=1k count=1
+TEST $QDD $N0/$QUOTA_LIMIT_DIR/1KB_file 1 1
 TEST grep -e "\"Usage is above soft limit:.*used by /$QUOTA_LIMIT_DIR\"" -- $BRICK_LOG_DIR/*
 
 #23
-TEST dd if=/dev/urandom of=$N0/1KB_file bs=1k count=1
+TEST $QDD $N0/1KB_file 1 1
 TEST grep -e "\"Usage is above soft limit:.*used by /\"" -- $BRICK_LOG_DIR/*
 
 #25
@@ -80,4 +84,7 @@ EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $N0
 
 TEST $CLI volume stop $V0
 EXPECT "1" get_aux
+
+rm -f $QDD
+
 cleanup;
diff --git a/tests/bugs/quota/inode-quota.t b/tests/bugs/quota/inode-quota.t
index 58376d5058f..55a26fa0d2b 100644
--- a/tests/bugs/quota/inode-quota.t
+++ b/tests/bugs/quota/inode-quota.t
@@ -20,6 +20,10 @@ function quota_object_list_field () {
 
 cleanup;
 
+QDD=$(dirname $0)/quota
+# compile the test write program and run it
+build_tester $(dirname $0)/../../basic/quota.c -o $QDD
+
 TESTS_EXPECTED_IN_LOOP=9
 
 TEST glusterd
@@ -81,18 +85,14 @@ EXPECT "10" quota_object_list_field "/test_dir" 2
 # Check the quota enforcement mechanism for usage
 #-----------------------------------------------------
 
-# Compile the program which basically created a file
-# of required size
-TEST $CC $(dirname $0)/../../basic/quota.c -o $(dirname $0)/quota
-
 # try creating a 8MB file and it should fail
-TEST $(dirname $0)/quota $M0/test_dir/test1.txt '8388608'
+TEST $QDD $M0/test_dir/test1.txt 256 32
 EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "8.0MB" quota_list_field "/test_dir" 2
 TEST rm -f $M0/test_dir/test1.txt
 EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "0Bytes" quota_list_field "/test_dir" 2
 
 # try creating a 15MB file and it should succeed
-TEST ! $(dirname $0)/quota $M0/test_dir/test2.txt '15728640'
+TEST ! $QDD $M0/test_dir/test2.txt 256 60
 TEST rm -f $M0/test_dir/test2.txt
 
 
@@ -130,4 +130,5 @@ TEST $CLI volume stop $V0
 EXPECT "1" get_aux
 TEST $CLI volume delete $V0
 
+rm -f $QDD
 cleanup;