summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2001-12-04 17:55:08 +0000
committerJim Meyering <jim@meyering.net>2001-12-04 17:55:08 +0000
commita95d10ec543e344d403461c406dca151da721dce (patch)
treee0260411daf320fa04d576aba018ff075d016df9
parent8f730b8a46d6e29c053da6205ba9db0253be01db (diff)
downloadcoreutils-a95d10ec543e344d403461c406dca151da721dce.tar.xz
Don't use diff's -u option. It's not portable.
Besides, with GNU diff one can use the DIFF_OPTIONS envvar.
-rwxr-xr-xtests/chgrp/basic2
-rwxr-xr-xtests/ls/no-arg4
-rwxr-xr-xtests/ls/recursive4
-rwxr-xr-xtests/ls/rt-14
4 files changed, 7 insertions, 7 deletions
diff --git a/tests/chgrp/basic b/tests/chgrp/basic
index 2e5ece7fa..fb4aa774b 100755
--- a/tests/chgrp/basic
+++ b/tests/chgrp/basic
@@ -85,6 +85,6 @@ changed group of `symlink' to G1
EOF
cmp expected actual \
- || { diff -u expected actual 1>&2; fail=1; }
+ || { diff expected actual 1>&2; fail=1; }
(exit $fail); exit
diff --git a/tests/ls/no-arg b/tests/ls/no-arg
index c25ea2537..9f68eefd9 100755
--- a/tests/ls/no-arg
+++ b/tests/ls/no-arg
@@ -35,7 +35,7 @@ fail=0
ls > out || fail=1
cmp out exp || fail=1
-test $fail = 1 && diff -u out exp 2> /dev/null
+test $fail = 1 && diff out exp 2> /dev/null
cat > exp <<\EOF
.:
@@ -54,6 +54,6 @@ EOF
ls -R > out || fail=1
cmp out exp || fail=1
-test $fail = 1 && diff -u out exp 2> /dev/null
+test $fail = 1 && diff out exp 2> /dev/null
(exit $fail); exit
diff --git a/tests/ls/recursive b/tests/ls/recursive
index 99608dbf4..a7809b45a 100755
--- a/tests/ls/recursive
+++ b/tests/ls/recursive
@@ -50,7 +50,7 @@ c:
EOF
cmp out exp || fail=1
-test $fail = 1 && diff -u out exp 2> /dev/null
+test $fail = 1 && diff out exp 2> /dev/null
rm -rf out exp
ls -R1 x y f > out || fail=1
@@ -63,6 +63,6 @@ y:
EOF
cmp out exp || fail=1
-test $fail = 1 && diff -u out exp 2> /dev/null
+test $fail = 1 && diff out exp 2> /dev/null
(exit $fail); exit
diff --git a/tests/ls/rt-1 b/tests/ls/rt-1
index d485a67aa..5a4288431 100755
--- a/tests/ls/rt-1
+++ b/tests/ls/rt-1
@@ -39,7 +39,7 @@ b
c
EOF
cmp out exp || fail=1
-test $fail = 1 && diff -u out exp 2> /dev/null
+test $fail = 1 && diff out exp 2> /dev/null
rm -rf out exp
ls -1rt a b c > out || fail=1
@@ -49,6 +49,6 @@ b
a
EOF
cmp out exp || fail=1
-test $fail = 1 && diff -u out exp 2> /dev/null
+test $fail = 1 && diff out exp 2> /dev/null
(exit $fail); exit