From c82b481dd23acb58bf5352084b8d6551b91f756b Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 4 Sep 2010 13:58:02 +0200 Subject: [PATCH] update-copyright test: Improve output when perl is missing or too old. * tests/test-update-copyright.sh: Move test of Perl version down after the test whether Perl exists. Provide an explanation relating Perl's error message to Automake's SKIP: message. --- ChangeLog | 7 +++++++ tests/test-update-copyright.sh | 11 +++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8eb7392061..e82e39f6ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-09-04 Bruno Haible + + update-copyright test: Improve output when perl is missing or too old. + * tests/test-update-copyright.sh: Move test of Perl version down after + the test whether Perl exists. Provide an explanation relating Perl's + error message to Automake's SKIP: message. + 2010-09-04 Bruno Haible Don't augment PATH in TESTS_ENVIRONMENT. diff --git a/tests/test-update-copyright.sh b/tests/test-update-copyright.sh index 971f651f93..fbf4f23bb4 100755 --- a/tests/test-update-copyright.sh +++ b/tests/test-update-copyright.sh @@ -16,10 +16,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Skip this test if Perl is too old. FIXME: 5.8.0 is just a guess. -# We have a report that 5.6.1 is inadequate and that 5.8.0 works. -perl -e 'require 5.8.0' || exit 77 - diffout=`diff -u /dev/null /dev/null 2>&1` if test x"$diffout" = x"" && test $? -eq 0; then compare() { diff -u "$@"; } @@ -54,6 +50,13 @@ echo a > $TMP-in exit 77 } +# Skip this test if Perl is too old. FIXME: 5.8.0 is just a guess. +# We have a report that 5.6.1 is inadequate and that 5.8.0 works. +perl -e 'require 5.8.0' || { + echo '$0: skipping this test; Perl version is too old' 1>&2 + exit 77 +} + # Do not let a different envvar setting perturb results. UPDATE_COPYRIGHT_MAX_LINE_LENGTH=72 export UPDATE_COPYRIGHT_MAX_LINE_LENGTH -- 2.30.2