From a1a9c03d12322d5795f91a5cf8d6c775c4a181ce Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 22 Mar 2024 13:55:04 +0100 Subject: [PATCH] gnulib-tool-tests: Avoid a test failure with Autoconf version != 2.72. --- gnulib-tool-tests/import-tests/test-emacs-1.sh | 4 ++++ gnulib-tool-tests/init.sh | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/gnulib-tool-tests/import-tests/test-emacs-1.sh b/gnulib-tool-tests/import-tests/test-emacs-1.sh index c6bac96c..8acd7b1b 100755 --- a/gnulib-tool-tests/import-tests/test-emacs-1.sh +++ b/gnulib-tool-tests/import-tests/test-emacs-1.sh @@ -1,5 +1,9 @@ #!/bin/sh . ../init.sh +case `autoconf --version | sed -e 's/^[^0-9]*//' -e 1q` in + 2.72) ;; + *) echo "Skipping test: Autoconf version 2.72 is needed for this test." >&2; exit 77 ;; +esac do_import_test emacs-20240101 . "--conditional-dependencies --import --no-changelog --no-vc-files --gnu-make --makefile-name=gnulib.mk.in `echo ' --avoid=btowc --avoid=chmod diff --git a/gnulib-tool-tests/init.sh b/gnulib-tool-tests/init.sh index bb4b8e4a..fad080ad 100644 --- a/gnulib-tool-tests/init.sh +++ b/gnulib-tool-tests/init.sh @@ -34,12 +34,12 @@ run_test_group () { fail=0 for f in $1; do - if ./$f; then - echo "PASS: $f" - else - echo "FAIL: $f" - fail=1 - fi + ./$f + case $? in + 0) echo "PASS: $f" ;; + 77) echo "SKIP: $f" ;; + *) echo "FAIL: $f"; fail=1 ;; + esac done exit $fail } -- 2.39.5