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'.
This commit is contained in:
parent
ac088bc85b
commit
932a5b2971
64
autoconf-2.69-bash-5-LINENO.patch
Normal file
64
autoconf-2.69-bash-5-LINENO.patch
Normal file
@ -0,0 +1,64 @@
|
||||
From 4c1f7a361f4fd6180b7b46b950e3bfe389b5b831 Mon Sep 17 00:00:00 2001
|
||||
From: Ondrej Dubaj <odubaj@redhat.com>
|
||||
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 40b7318..f3ad2b5 100644
|
||||
--- a/tests/local.at
|
||||
+++ b/tests/local.at
|
||||
@@ -324,7 +324,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 |
|
||||
@@ -381,6 +381,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 4e4da5d..80684ca 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])
|
||||
--
|
||||
2.19.1
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
Summary: A GNU tool for automatically configuring source code
|
||||
Name: autoconf
|
||||
Version: 2.69
|
||||
Release: 30%{?dist}
|
||||
Release: 31%{?dist}
|
||||
License: GPLv2+ and GFDL
|
||||
Source0: http://ftpmirror.gnu.org/autoconf/autoconf-%{version}.tar.xz
|
||||
Source1: config.site
|
||||
@ -14,6 +14,7 @@ Source2: autoconf-init.el
|
||||
URL: http://www.gnu.org/software/autoconf/
|
||||
|
||||
Patch1: autoconf-2.69-perl-5.22-autoscan.patch
|
||||
Patch2: autoconf-2.69-bash-5-LINENO.patch
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
@ -122,6 +123,9 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_emacs_sitestartdir}
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Aug 28 2019 Ondrej Dubaj <odubaj@redhat.com> - 2.69-31
|
||||
- Port tests to Bash 5
|
||||
|
||||
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.69-30
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user