summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2011-11-22 10:18:30 +0100
committerJim Meyering <meyering@redhat.com>2011-11-22 10:34:43 +0100
commit9d98634b3908786bb048b72624da244e681f87b9 (patch)
treeea46e0b4f6d08e67fce4e85e848ad8d338ea9cdb
parentad10c145ff5ae776598671ed840a446dc120b871 (diff)
downloadcoreutils-9d98634b3908786bb048b72624da244e681f87b9.tar.xz
tests: use compare, not "diff", in a few stray tests
* tests/install/basic-1: Use compare, not diff. * tests/mkdir/p-v: Likewise. * tests/mv/part-fail: Likewise. * tests/rm/rm1: Likewise. * tests/rm/rm2: Likewise. * tests/touch/not-owner: Likewise.
-rwxr-xr-xtests/install/basic-12
-rwxr-xr-xtests/mkdir/p-v2
-rwxr-xr-xtests/mv/part-fail2
-rwxr-xr-xtests/rm/rm12
-rwxr-xr-xtests/rm/rm22
-rwxr-xr-xtests/touch/not-owner2
6 files changed, 6 insertions, 6 deletions
diff --git a/tests/install/basic-1 b/tests/install/basic-1
index 9863becf9..ec6449cbd 100755
--- a/tests/install/basic-1
+++ b/tests/install/basic-1
@@ -104,7 +104,7 @@ fi
touch file || fail=1
ginstall -Dv file sub3/a/b/c/file >out 2>&1 || fail=1
-diff - out <<\EOF || fail=1
+compare - out <<\EOF || fail=1
ginstall: creating directory `sub3'
ginstall: creating directory `sub3/a'
ginstall: creating directory `sub3/a/b'
diff --git a/tests/mkdir/p-v b/tests/mkdir/p-v
index e2e7f54a1..afee93bcd 100755
--- a/tests/mkdir/p-v
+++ b/tests/mkdir/p-v
@@ -21,7 +21,7 @@ print_ver_ mkdir
mkdir -pv foo/a/b/c/d >out || fail=1
-diff - out <<\EOF
+compare - out <<\EOF
mkdir: created directory `foo'
mkdir: created directory `foo/a'
mkdir: created directory `foo/a/b'
diff --git a/tests/mv/part-fail b/tests/mv/part-fail
index 8d2566964..c653df823 100755
--- a/tests/mv/part-fail
+++ b/tests/mv/part-fail
@@ -50,6 +50,6 @@ else
fail=1
fi
fi
-test $fail = 1 && diff out exp 2> /dev/null
+test $fail = 1 && compare out exp
Exit $fail
diff --git a/tests/rm/rm1 b/tests/rm/rm1
index ce0d87150..f4f43d042 100755
--- a/tests/rm/rm1
+++ b/tests/rm/rm1
@@ -39,7 +39,7 @@ EOF
cmp out exp > /dev/null 2>&1 || {
cmp out exp2 || fail=1
}
-test $fail = 1 && diff out exp 2> /dev/null
+test $fail = 1 && compare out exp
test -d b/a/p || fail=1
test -d b/c && fail=1
diff --git a/tests/rm/rm2 b/tests/rm/rm2
index 0cd089291..6df1e2090 100755
--- a/tests/rm/rm2
+++ b/tests/rm/rm2
@@ -42,7 +42,7 @@ EOF
cmp out exp > /dev/null 2>&1 \
|| { cmp out exp-solaris > /dev/null 2>&1 || fail=1; }
-test $fail = 1 && diff out exp 2> /dev/null
+test $fail = 1 && compare out exp
test -d a/0 && fail=1
test -d a/1 || fail=1
diff --git a/tests/touch/not-owner b/tests/touch/not-owner
index 1166c1608..98dd4e348 100755
--- a/tests/touch/not-owner
+++ b/tests/touch/not-owner
@@ -50,6 +50,6 @@ EOF
done
test "$match" = 1 || fail=1
-test $fail = 1 && diff out exp 2> /dev/null
+test $fail = 1 && compare out exp
Exit $fail