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/bugs/bug-1038598.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/bugs/bug-1038598.t')
-rw-r--r-- | tests/bugs/bug-1038598.t | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/bugs/bug-1038598.t b/tests/bugs/bug-1038598.t index d4b0b3e63ae..4846b7dc78a 100644 --- a/tests/bugs/bug-1038598.t +++ b/tests/bugs/bug-1038598.t @@ -59,12 +59,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=1M count=4 +TEST dd if=/dev/zero of=$M0/test_dir/file1.txt bs=1024k count=4 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=1M count=6 +TEST dd if=/dev/zero of=$M0/test_dir/file1.txt bs=1024k count=6 EXPECT "6.0MB" usage "/test_dir"; EXPECT 'Yes' sl_exceeded "/test_dir"; EXPECT 'No' hl_exceeded "/test_dir"; @@ -73,7 +73,7 @@ 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=1M count=15 +TEST ! dd if=/dev/zero of=$M0/test_dir/file1.txt bs=1024k count=15 EXPECT 'Yes' sl_exceeded "/test_dir"; EXPECT 'Yes' hl_exceeded "/test_dir"; |