From fd9e6494dfe56f58d60cd9c22356e1ad70366fab7048be1e3ef6a521d51d16d4 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 6 Nov 2019 16:33:58 +0000 Subject: [PATCH] Accepting request 745572 from home:StefanBruens:branches:devel:tools:building - Fix testsuite with Bash 5, add port-tests-to-bash-5.patch OBS-URL: https://build.opensuse.org/request/show/745572 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/autoconf?expand=0&rev=44 --- autoconf-el.changes | 5 +++ autoconf-testsuite.changes | 5 +++ autoconf-testsuite.spec | 3 ++ autoconf.changes | 5 +++ autoconf.spec | 3 ++ port-tests-to-bash-5.patch | 63 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 84 insertions(+) create mode 100644 port-tests-to-bash-5.patch diff --git a/autoconf-el.changes b/autoconf-el.changes index 125e60e..83a35e4 100644 --- a/autoconf-el.changes +++ b/autoconf-el.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 5 23:07:29 UTC 2019 - Stefan Brüns + +- Fix testsuite with Bash 5, add port-tests-to-bash-5.patch + ------------------------------------------------------------------- Wed Oct 30 17:01:32 UTC 2019 - Stefan Brüns diff --git a/autoconf-testsuite.changes b/autoconf-testsuite.changes index 125e60e..83a35e4 100644 --- a/autoconf-testsuite.changes +++ b/autoconf-testsuite.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 5 23:07:29 UTC 2019 - Stefan Brüns + +- Fix testsuite with Bash 5, add port-tests-to-bash-5.patch + ------------------------------------------------------------------- Wed Oct 30 17:01:32 UTC 2019 - Stefan Brüns diff --git a/autoconf-testsuite.spec b/autoconf-testsuite.spec index 4528649..b9699db 100644 --- a/autoconf-testsuite.spec +++ b/autoconf-testsuite.spec @@ -30,6 +30,8 @@ Patch0: autoreconf-ltdl.diff Patch1: autoconf-perl-5.17-fixes.patch # PATCH-FIX-UPSTREAM AC_HEADER_MAJOR: port to glibc 2.25 Patch2: ac-header-major.patch +# PATCH-FIX-UPSTREAM Port tests to Bash 5 +Patch3: port-tests-to-bash-5.patch BuildRequires: help2man BuildRequires: m4 >= 1.4.6 Requires: info @@ -58,6 +60,7 @@ only required for the generation of the scripts, not their use. %patch0 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %configure diff --git a/autoconf.changes b/autoconf.changes index 125e60e..83a35e4 100644 --- a/autoconf.changes +++ b/autoconf.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 5 23:07:29 UTC 2019 - Stefan Brüns + +- Fix testsuite with Bash 5, add port-tests-to-bash-5.patch + ------------------------------------------------------------------- Wed Oct 30 17:01:32 UTC 2019 - Stefan Brüns diff --git a/autoconf.spec b/autoconf.spec index d0feef1..31933b1 100644 --- a/autoconf.spec +++ b/autoconf.spec @@ -30,6 +30,8 @@ Patch0: autoreconf-ltdl.diff Patch1: autoconf-perl-5.17-fixes.patch # PATCH-FIX-UPSTREAM AC_HEADER_MAJOR: port to glibc 2.25 Patch2: ac-header-major.patch +# PATCH-FIX-UPSTREAM Port tests to Bash 5 +Patch3: port-tests-to-bash-5.patch BuildRequires: help2man BuildRequires: m4 >= 1.4.6 Requires: info @@ -58,6 +60,7 @@ only required for the generation of the scripts, not their use. %patch0 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %configure diff --git a/port-tests-to-bash-5.patch b/port-tests-to-bash-5.patch new file mode 100644 index 0000000..1f53eb3 --- /dev/null +++ b/port-tests-to-bash-5.patch @@ -0,0 +1,63 @@ +From 5b9db67786a428164abafe626ab11a2754aad528 Mon Sep 17 00:00:00 2001 +From: Ondrej Dubaj +Date: Wed, 28 Aug 2019 07:39:50 +0200 +Subject: [PATCH] Port tests to Bash 5 + +* tests/local.at (AT_CHECK_ENV, AT_CONFIG_CMP): +Add BASH_ARGC, BASH_ARGV to list of variables to be ignored when +comparing variable space dumps. +(AT_CONFIG_CMP): Also ignore LINENO. +* tests/m4sh.at: Also unset LINENO in 'reference' and 'test/test-1'. +--- + tests/local.at | 5 ++++- + tests/m4sh.at | 4 ++-- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/tests/local.at b/tests/local.at +index a22958c..852be28 100644 +--- a/tests/local.at ++++ b/tests/local.at +@@ -325,7 +325,7 @@ if test -f state-env.before && test -f state-env.after; then + [AWK|LEX|LEXLIB|LEX_OUTPUT_ROOT|LN_S|M4|MKDIR_P|RANLIB|SET_MAKE|YACC], + [GREP|[EF]GREP|SED], + [[_@]|.[*#?$].], +- [argv|ARGC|LINENO|OLDPWD|PIPESTATUS|RANDOM|SECONDS]))=' \ ++ [argv|ARGC|LINENO|BASH_ARGC|BASH_ARGV|OLDPWD|PIPESTATUS|RANDOM|SECONDS]))=' \ + $act_file || + test $? -eq 1 || echo failed >&2 + ) 2>stderr-$act_file | +@@ -382,6 +382,9 @@ do + /'\'\\\$\''=/ d + /^argv=/ d + /^ARGC=/ d ++ /^BASH_ARGC=/ d ++ /^BASH_ARGV=/ d ++ /^LINENO=/ d + ' $act_file >at_config_vars-$act_file + done + AT_CMP([at_config_vars-$1], [at_config_vars-$2])[]dnl +diff --git a/tests/m4sh.at b/tests/m4sh.at +index e9d70b0..cbdfcb6 100644 +--- a/tests/m4sh.at ++++ b/tests/m4sh.at +@@ -254,7 +254,7 @@ AT_CHECK([autom4te -l m4sh $1.as -o $1]) + # `_oline_', once processed and ran, produces our reference. + # We check that we find ourselves by looking at a string which is + # available only in the original script: `_oline_'. +-AT_DATA_LINENO([reference], [false], [__OLINE__], [_oline__]) ++AT_DATA_LINENO([reference], [true], [__OLINE__], [_oline__]) + AT_CHECK([./reference], 0, [stdout]) + + # The reference: +@@ -264,7 +264,7 @@ mv stdout expout + # Be sure to be out of the PATH. + AT_CHECK([mkdir test || exit 77]) + +-AT_DATA_LINENO([test/test-1], [false], [__LINENO__], [LINENO]) ++AT_DATA_LINENO([test/test-1], [true], [__LINENO__], [LINENO]) + AT_CHECK([./test/test-1], 0, [expout]) + AT_CHECK([(PATH=test$PATH_SEPARATOR$PATH; export PATH; exec test-1)], + 0, [expout]) +-- +1.9.1 +