diff options
| author | Emmanuel Dreyfus <manu@netbsd.org> | 2014-07-10 05:45:52 +0200 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2014-07-14 06:29:15 -0700 |
| commit | 210a59e48a52515615e440e2a6e1b650063c370b (patch) | |
| tree | d7b6c13f342fc7ca01c17216720cf52990bd70aa /tests/basic/quota.t | |
| parent | f637f2f101b13388187f8a6852d3ae6f1d9c2ad5 (diff) | |
Regression test portability: dd usage
NetBSD, FreeBSD, and MacOS X dd(1) bs argument uses m for megabyte, while
Linux uses M. Use bs=1024k instead of bs=1M for better compatibility.
BUG: 764655
Change-Id: I603f57adbc9b31f6d634b918726437fbfce42e03
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>
Reviewed-on: http://review.gluster.org/8278
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Harshavardhana <harsha@harshavardhana.net>
Reviewed-by: Justin Clift <justin@gluster.org>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'tests/basic/quota.t')
| -rwxr-xr-x | tests/basic/quota.t | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/basic/quota.t b/tests/basic/quota.t index 1f6febd73a5..ae45a6357cd 100755 --- a/tests/basic/quota.t +++ b/tests/basic/quota.t @@ -70,19 +70,19 @@ TEST $CLI volume quota $V0 hard-timeout 0 ## Verify quota enforcement ## ----------------------------- -TEST ! dd if=/dev/urandom of=$M0/test_dir/1.txt bs=1M count=12 +TEST ! dd if=/dev/urandom of=$M0/test_dir/1.txt bs=1024k count=12 TEST rm $M0/test_dir/1.txt # wait for marker's accounting to complete EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "0Bytes" usage "/test_dir" -TEST dd if=/dev/urandom of=$M0/test_dir/2.txt bs=1M count=8 +TEST dd if=/dev/urandom of=$M0/test_dir/2.txt bs=1024k count=8 EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "8.0MB" usage "/test_dir" TEST rm $M0/test_dir/2.txt EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "0Bytes" usage "/test_dir" ## rename tests -TEST dd if=/dev/urandom of=$M0/test_dir/2 bs=1M count=8 +TEST dd if=/dev/urandom of=$M0/test_dir/2 bs=1024k count=8 EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "8.0MB" usage "/test_dir" TEST mv $M0/test_dir/2 $M0/test_dir/0 EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "8.0MB" usage "/test_dir" @@ -137,7 +137,7 @@ done #53-62 for i in `seq 1 9`; do TEST_IN_LOOP dd if=/dev/urandom of="$M0/$TESTDIR/dir1/10MBfile$i" \ - bs=1M count=10; + bs=1024k count=10; done # 63-64 @@ -159,7 +159,7 @@ done ## <Try creating data beyond limit> ## -------------------------------- for i in `seq 1 200`; do - dd if=/dev/urandom of="$M0/$TESTDIR/dir1/1MBfile$i" bs=1M count=1 \ + dd if=/dev/urandom of="$M0/$TESTDIR/dir1/1MBfile$i" bs=1024k count=1 \ &>/dev/null done |