summaryrefslogtreecommitdiff
path: root/tests/dd
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2011-08-04 20:52:31 +0200
committerJim Meyering <meyering@redhat.com>2011-08-08 10:11:48 +0200
commit554caaf6ffc721fe83debe0eb5e555136b01f0bb (patch)
tree3434c8a4fca2cdac2ec5fca8bd808bd17a6f4d30 /tests/dd
parent8e2767a3f0c279d355f067e53be2c63173959eb1 (diff)
downloadcoreutils-554caaf6ffc721fe83debe0eb5e555136b01f0bb.tar.xz
tests: complete the renaming framework_failure -> framework_failure_
These changes were mostly mechanical, made by running the following command: git grep -lw framework_failure | grep -v ChangeLog \ | xargs perl -pi -e 's/\b(framework_failure)\b/${1}_/' and then editing init.cfg and `tests/cp/cp-a-selinux' by hand. * tests/init.cfg (framework_failure): Remove, `framework_failure_' from init.sh should be used instead in the tests. Remove now-obsolete "FIXME" comment. (is_local_dir_, require_strace_, require_membership_in_two_groups_, require_sparse_support_, skip_if_mcstransd_is_running_, mkfifo_or_skip_) Use `framework_failure_', not `framework_failure'. * Many test scripts: Likewise.
Diffstat (limited to 'tests/dd')
-rwxr-xr-xtests/dd/direct8
-rwxr-xr-xtests/dd/misc10
-rwxr-xr-xtests/dd/nocache2
-rwxr-xr-xtests/dd/reblock4
-rwxr-xr-xtests/dd/skip-seek-past-dev6
-rwxr-xr-xtests/dd/skip-seek-past-file6
-rwxr-xr-xtests/dd/unblock-sync2
7 files changed, 19 insertions, 19 deletions
diff --git a/tests/dd/direct b/tests/dd/direct
index 9350545a6..41874f772 100755
--- a/tests/dd/direct
+++ b/tests/dd/direct
@@ -19,13 +19,13 @@
. "${srcdir=.}/init.sh"; path_prepend_ ../src
print_ver_ dd
-truncate -s 8192 in || framework_failure
+truncate -s 8192 in || framework_failure_
dd if=in oflag=direct of=out 2> /dev/null \
|| skip_ 'this file system lacks support for O_DIRECT'
-truncate -s 511 short || framework_failure
-truncate -s 8191 m1 || framework_failure
-truncate -s 8193 p1 || framework_failure
+truncate -s 511 short || framework_failure_
+truncate -s 8191 m1 || framework_failure_
+truncate -s 8193 p1 || framework_failure_
for i in short m1 p1; do
rm -f out
diff --git a/tests/dd/misc b/tests/dd/misc
index 820984c92..27520c4c4 100755
--- a/tests/dd/misc
+++ b/tests/dd/misc
@@ -26,9 +26,9 @@ tmp_sym=dd-sym
tmp_out=dd-out
warn=0
-echo data > $tmp_in || framework_failure
-ln $tmp_in $tmp_in2 || framework_failure
-ln -s $tmp_in $tmp_sym || framework_failure
+echo data > $tmp_in || framework_failure_
+ln $tmp_in $tmp_in2 || framework_failure_
+ln -s $tmp_in $tmp_sym || framework_failure_
dd if=$tmp_in of=$tmp_out 2> /dev/null || fail=1
compare $tmp_in $tmp_out || fail=1
@@ -87,9 +87,9 @@ test "$outbytes" -eq 3 || fail=1
# There might be some missed failures but it's unlikely.
(echo a; sleep .1; echo b) \
| env LC_ALL=C dd bs=4 status=noxfer iflag=fullblock >out 2>err || fail=1
-printf 'a\nb\n' > out_ok || framework_failure
+printf 'a\nb\n' > out_ok || framework_failure_
echo "1+0 records in
-1+0 records out" > err_ok || framework_failure
+1+0 records out" > err_ok || framework_failure_
compare out_ok out || fail=1
compare err_ok err || fail=1
diff --git a/tests/dd/nocache b/tests/dd/nocache
index 0af165dc9..5dcd897a4 100755
--- a/tests/dd/nocache
+++ b/tests/dd/nocache
@@ -31,7 +31,7 @@ dd iflag=nocache,direct if=/dev/null && fail=1
# The rest ensure that the documented uses cases
# proceed without error
for f in ifile ofile; do
- dd if=/dev/zero of=$f conv=fdatasync count=100 || framework_failure
+ dd if=/dev/zero of=$f conv=fdatasync count=100 || framework_failure_
done
# Advise to drop cache for whole file
diff --git a/tests/dd/reblock b/tests/dd/reblock
index f66a9ba7c..558d729e1 100755
--- a/tests/dd/reblock
+++ b/tests/dd/reblock
@@ -20,14 +20,14 @@
print_ver_ dd
# 2 short reads -> 1 full write + 1 partial write
-cat <<\EOF > exp-reblock || framework_failure
+cat <<\EOF > exp-reblock || framework_failure_
0+2 records in
1+1 records out
4 bytes (4 B) copied
EOF
# 2 short reads -> 2 partial writes
-cat <<\EOF > exp-no-reblock || framework_failure
+cat <<\EOF > exp-no-reblock || framework_failure_
0+2 records in
0+2 records out
4 bytes (4 B) copied
diff --git a/tests/dd/skip-seek-past-dev b/tests/dd/skip-seek-past-dev
index a54e0106c..3f1927fe5 100755
--- a/tests/dd/skip-seek-past-dev
+++ b/tests/dd/skip-seek-past-dev
@@ -33,7 +33,7 @@ get_device_size() {
# Get path to device the current dir is on.
# Note df can only get fs size, not device size.
-device=$(df -P . | tail -n1 | cut -d' ' -f1) || framework_failure
+device=$(df -P . | tail -n1 | cut -d' ' -f1) || framework_failure_
dev_size=$(get_device_size "$device") ||
skip_ "failed to determine size of $device"
@@ -45,14 +45,14 @@ timeout 10 dd bs=1 skip=$DEV_OFLOW count=0 status=noxfer < "$device" 2> err
test "$?" = "1" || fail=1
echo "dd: \`standard input': cannot skip: Invalid argument
0+0 records in
-0+0 records out" > err_ok || framework_failure
+0+0 records out" > err_ok || framework_failure_
compare err_ok err || fail=1
timeout 10 dd bs=1 seek=$DEV_OFLOW count=0 status=noxfer > "$device" 2> err
test "$?" = "1" || fail=1
echo "dd: \`standard output': cannot seek: Invalid argument
0+0 records in
-0+0 records out" > err_ok || framework_failure
+0+0 records out" > err_ok || framework_failure_
compare err_ok err || fail=1
Exit $fail
diff --git a/tests/dd/skip-seek-past-file b/tests/dd/skip-seek-past-file
index 29ae8ebf9..c1930def4 100755
--- a/tests/dd/skip-seek-past-file
+++ b/tests/dd/skip-seek-past-file
@@ -22,12 +22,12 @@ require_sparse_support_ # for `truncate --size=$OFF_T_MAX`
eval $(getlimits) # for OFF_T limits
-printf "1234" > file || framework_failure
+printf "1234" > file || framework_failure_
echo "\
dd: \`standard input': cannot skip to specified offset
0+0 records in
-0+0 records out" > skip_err || framework_failure
+0+0 records out" > skip_err || framework_failure_
# skipping beyond number of blocks in file should issue a warning
dd bs=1 skip=5 count=0 status=noxfer < file 2> err || fail=1
@@ -60,7 +60,7 @@ compare skip_err err || fail=1
# seeking beyond end of file is OK
dd bs=1 seek=5 count=0 status=noxfer > file 2> err || fail=1
echo "0+0 records in
-0+0 records out" > err_ok || framework_failure
+0+0 records out" > err_ok || framework_failure_
compare err_ok err || fail=1
# skipping > OFF_T_MAX should fail immediately
diff --git a/tests/dd/unblock-sync b/tests/dd/unblock-sync
index 28ed568d0..a6fd4a52c 100755
--- a/tests/dd/unblock-sync
+++ b/tests/dd/unblock-sync
@@ -19,7 +19,7 @@
. "${srcdir=.}/init.sh"; path_prepend_ ../src
print_ver_ dd
-printf 000100020003xx > in || framework_failure
+printf 000100020003xx > in || framework_failure_
dd cbs=4 ibs=4 conv=unblock,sync < in > out 2> /dev/null || fail=1