Mercurial > hg > octave-lojdl > gnulib-hg
changeset 16220:8fe91c84e635
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.
| author | Jim Meyering <meyering@redhat.com> |
|---|---|
| date | Wed, 04 Jan 2012 20:19:37 +0100 |
| parents | 37f2db4c9412 |
| children | ac0305d6960d |
| files | ChangeLog tests/test-init.sh |
| diffstat | 2 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-01-04 Jim Meyering <meyering@redhat.com> + + 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 <eggert@cs.ucla.edu> test-posixtm: don't assume signed integer wraparound
--- a/tests/test-init.sh +++ b/tests/test-init.sh @@ -52,13 +52,15 @@ 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 }