Don't use diff's -u option. It's not portable.

Besides, with GNU diff one can use the DIFF_OPTIONS envvar.

diff --git a/tests/chgrp/basic b/tests/chgrp/basic
index 2e5ece7fae909aa0de051b1e8fae47d154294f05..fb4aa774b4b154fdb67db9cc21bd93b283dcd5eb 100755 (executable)
--- 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 c25ea2537a166c1a39f146a794e274d516971635..9f68eefd9851f97ee5a5a17d9c2b0944f61f5215 100755 (executable)
--- 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 99608dbf4c05f19a906ba434b0f43f4c5ff43314..a7809b45a1d3368335397678a14d6ef3a83727ad 100755 (executable)
--- 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 d485a67aaabe5e77a3ffe42d06de34007cf6f6b3..5a4288431f8a5d2a3218c551bb7a2ffeac11c575 100755 (executable)
--- 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