test library: Only use GNU diff when available

* tests/test-lib.sh: Only use GNU diff when available.
* tests/dash-o-append: Fix the expected result.

3 files changed, 13 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 9bb684a..865fb83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-05-05  Andreas Gruenbacher  <agruen@suse.de>
 
+	* tests/test-lib.sh: Only use GNU diff when available.
+	* tests/dash-o-append: Fix the expected result.
+
 	* tests/create-delete: Do not use 'diff' here.
 	* tests/merge: Require GNU diff.
 
diff --git a/tests/dash-o-append b/tests/dash-o-append
index 9d7d30a..cc2bcbf 100644
--- a/tests/dash-o-append
+++ b/tests/dash-o-append
@@ -39,5 +39,5 @@ EOF
 
 check 'cat a.new' <<EOF
 two
-four
+three
 EOF
diff --git a/tests/test-lib.sh b/tests/test-lib.sh
index eeb6492..0c7404a 100644
--- a/tests/test-lib.sh
+++ b/tests/test-lib.sh
@@ -58,14 +58,16 @@ clean_env() {
 	  VERSION_CONTROL PATCH_VERSION_CONTROL GDB
 }
 
-if type sed > /dev/null 2> /dev/null; then
-    eval '_beautify() {
-	sed -e "1s:.*:--- expected:" \
-	    -e "2s:.*:+++ got:"
+if diff -u -L expected -L got /dev/null /dev/null 2> /dev/null; then
+    eval '_compare() {
+	diff -u -L expected -L got "$1" "$2"
     }'
 else
-    eval '_beautify() {
-	cat
+    eval '_compare() {
+	echo "expected:"
+	cat "$1"
+	echo "got:"
+	cat "$2"
     }'
 fi
 
@@ -81,7 +83,7 @@ _check() {
 	if test "$expected" != "$got" ; then
 	    echo "$expected" > expected~
 	    echo "$got" > got~
-	    diff -u expected~ got~ | _beautify
+	    _compare expected~ got~
 	    rm -f expected~ got~
 	fi
 	checks_failed="$checks_failed + 1"