summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmmanuel Dreyfus <manu@netbsd.org>2014-10-01 06:18:50 +0200
committerHarshavardhana <harsha@harshavardhana.net>2014-10-01 08:54:31 -0700
commit0e1419d6fbf008b6384236d6103066afbc92dd77 (patch)
tree06646117b6347df73133651d6642a4a3ccfea398
parentf54dd171bca5086f11733a1c4fe578e838b2e6fd (diff)
Regression test portability: truncate
Use truncate -s 1M instead of truncate --size=1m for portability sake BUG: 1129939 Change-Id: I5bf6ca1f9bb4fa3c91796a659a06bf368776b3e5 Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org> Reviewed-on: http://review.gluster.org/8894 Reviewed-by: Xavier Hernandez <xhernandez@datalab.es> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> Reviewed-by: Harshavardhana <harsha@harshavardhana.net> Tested-by: Harshavardhana <harsha@harshavardhana.net>
-rw-r--r--tests/basic/ec/ec.t4
-rwxr-xr-xtests/bugs/bug-915554.t2
-rw-r--r--tests/bugs/bug-949242.t2
-rwxr-xr-xtests/features/weighted-rebalance.t4
4 files changed, 6 insertions, 6 deletions
diff --git a/tests/basic/ec/ec.t b/tests/basic/ec/ec.t
index b4ce338231c..864f9f72bad 100644
--- a/tests/basic/ec/ec.t
+++ b/tests/basic/ec/ec.t
@@ -37,7 +37,7 @@ function check_create_write {
}
function check_truncate {
- truncate --size=8192 $tmpdir/truncate
+ truncate -s 8192 $tmpdir/truncate
for b in $*; do
cmp $tmpdir/truncate $b/truncate || return 1
done
@@ -165,7 +165,7 @@ sleep 10
# Test create+write
TEST cp $tmpdir/create-write $M0/
# Test truncate
-TEST truncate --size=8192 $M0/truncate
+TEST truncate -s 8192 $M0/truncate
# Test hard link
TEST ln $M0/hard-link-1 $M0/hard-link-2
# Test soft link
diff --git a/tests/bugs/bug-915554.t b/tests/bugs/bug-915554.t
index 7d6f1336e29..b0c653ec5f7 100755
--- a/tests/bugs/bug-915554.t
+++ b/tests/bugs/bug-915554.t
@@ -30,7 +30,7 @@ i=1
# Write some data to a file and extend such that the file is sparse to a sector
# aligned boundary.
echo test > $M0/$i
-TEST truncate --size=1m $M0/$i
+TEST truncate -s 1M $M0/$i
# cache the original size
SIZE1=`stat -c %s $M0/$i`
diff --git a/tests/bugs/bug-949242.t b/tests/bugs/bug-949242.t
index c596cf7f25b..31e5bf6be6f 100644
--- a/tests/bugs/bug-949242.t
+++ b/tests/bugs/bug-949242.t
@@ -33,7 +33,7 @@ TEST unlink $M0/file
# truncate a file to a fixed size, fallocate and verify that the size does not
# change
-TEST truncate --size=1m $M0/file
+TEST truncate -s 1M $M0/file
TEST fallocate -l 2m -n $M0/file
blksz=`stat -c %b $M0/file`
nblks=`stat -c %B $M0/file`
diff --git a/tests/features/weighted-rebalance.t b/tests/features/weighted-rebalance.t
index b9d9eb4eb73..3964fb22290 100755
--- a/tests/features/weighted-rebalance.t
+++ b/tests/features/weighted-rebalance.t
@@ -46,11 +46,11 @@ TEST $CLI volume info
TEST mkdir ${B0}/${V0}{1,2}
-TEST truncate --size $((40*1024*1024)) ${B0}/disk1
+TEST truncate -s $((40*1024*1024)) ${B0}/disk1
TEST mkfs.xfs -f -i size=512 ${B0}/disk1
TEST mount -o loop ${B0}/disk1 ${B0}/${V0}1
-TEST truncate --size $((80*1024*1024)) ${B0}/disk2
+TEST truncate -s $((80*1024*1024)) ${B0}/disk2
TEST mkfs.xfs -f -i size=512 ${B0}/disk2
TEST mount -o loop ${B0}/disk2 ${B0}/${V0}2