From: Jim Meyering <jim@meyering.net>
Date: Mon, 25 Sep 2000 20:23:43 +0000 (+0000)
Subject: Don't use `diff -u'.  It's not portable.
X-Git-Tag: TEXTUTILS-2_0_8~116
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=ec00767a8e48c2595c82e9d956596b5a14ec405e;p=thirdparty%2Fcoreutils.git

Don't use `diff -u'.  It's not portable.
Run `diff -c' only if cmp finds a difference.
---

diff --git a/tests/cp/same-file b/tests/cp/same-file
index ae077c8169..6752b4f0ed 100755
--- a/tests/cp/same-file
+++ b/tests/cp/same-file
@@ -182,8 +182,10 @@ cat <<\EOF > $expected
 
 EOF
 
-# Uncomment this if you see a failure and want to try to diagnose it.
-diff -u $expected $actual 1>&2
+fail=0;
 
-cmp $expected $actual
-exit $?
+# Some folks don't have diff.
+cmp $expected $actual \
+  || { diff -c $expected $actual 1>&2; fail=1; }
+
+(exit $fail); exit