From 3cea0e35fab589010eb099a4fdb926c8c4b113b3 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Fri, 23 Mar 2018 16:46:13 -0700 Subject: [PATCH] test-version-etc.sh: port to diff without -c * tests/test-version-etc.sh: Don't use diff's -c option. This caused spurious test failure on Alpine Linux, which uses busybox's diff. Reported by Assaf Gordon in https://lists.gnu.org/r/sed-devel/2018-03/msg00013.html --- ChangeLog | 8 ++++++++ tests/test-version-etc.sh | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9839555c7..20cd7cd53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2018-03-23 Jim Meyering + + test-version-etc.sh: port to diff without -c + * tests/test-version-etc.sh: Don't use diff's -c option. + This caused spurious test failure on Alpine Linux, which + uses busybox's diff. Reported by Assaf Gordon in + https://lists.gnu.org/r/sed-devel/2018-03/msg00013.html + 2018-03-23 Paul Eggert c-stack: port to recent GCC build diff --git a/tests/test-version-etc.sh b/tests/test-version-etc.sh index c197730af..0b1f5be1f 100755 --- a/tests/test-version-etc.sh +++ b/tests/test-version-etc.sh @@ -36,7 +36,7 @@ EOT /^Packaged by/d 2,3 s/Copyright (C) [0-9]\{4,4\}/COPYRIGHT/' | tr -d '\015' | - diff -c $TMP - || ERR=1 + diff $TMP - || ERR=1 rm $TMP -- 2.13.5