From 231295ee26c4ebe046d52a943b537c813ac9fb02 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Wed, 4 Jan 2012 20:19:37 +0100 Subject: [PATCH] test-init.sh: accommodate Solaris 5.10's different diff -u output * tests/test-init.sh: Also exempt @@ lines from the comparison of diff output, since Solaris 5.10 and GNU diff formats differ. Reported by Stefano Lattarini. --- ChangeLog | 7 +++++++ tests/test-init.sh | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0f554e6d3..10ddc0bda 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-01-04 Jim Meyering + + test-init.sh: accommodate Solaris 5.10's different diff -u output + * tests/test-init.sh: Also exempt @@ lines from the comparison + of diff output, since Solaris 5.10 and GNU diff formats differ. + Reported by Stefano Lattarini. + 2012-01-04 Paul Eggert test-posixtm: don't assume signed integer wraparound diff --git a/tests/test-init.sh b/tests/test-init.sh index 123da8e77..ee1c798a9 100755 --- a/tests/test-init.sh +++ b/tests/test-init.sh @@ -52,13 +52,15 @@ EOF compare empty in >out 2>err && fail=1 # Remove the TAB-date suffix on each --- and +++ line, # for both the expected and the actual output files. + # Also remove the @@ line, since Solaris 5.10 and GNU diff formats differ: + # -@@ -0,0 +1 @@ + # +@@ -1,0 +1,1 @@ cat <<\EOF > exp --- empty +++ in -@@ -0,0 +1 @@ +xyz EOF - sed 's/ .*//' out > k && mv k out + sed 's/ .*//;/^@@/d' out > k && mv k out compare exp out || fail=1 case $- in *x*) ;; *) test -s err && fail_ "err not empty: $(cat err)";; esac } -- 2.11.0