You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
70 lines
2.3 KiB
70 lines
2.3 KiB
8 months ago
|
From 412166e185c00d6eacbe67dfcb0326f622ec4020 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Xi Ruoyao <xry111@xry111.site>
|
||
|
|
Date: Fri, 30 Sep 2022 11:36:03 -0400
|
||
|
|
Subject: [PATCH] Fix testsuite failures with bash 5.2.
|
||
|
|
|
||
|
|
Bash v5.2 includes several new optimizations to the number of
|
||
|
|
subshells used for various constructs; as a side effect, the value of
|
||
|
|
SHLVL is less stable than it used to be. Add SHLVL to the list of
|
||
|
|
built-in shell variables with unstable values, to be ignored when
|
||
|
|
checking for inappropriate differences to the shell environment
|
||
|
|
before and after a macro invocation / between two configure runs.
|
||
|
|
|
||
|
|
Problem and solution reported by Xi Ruoyao in
|
||
|
|
https://lists.gnu.org/archive/html/autoconf/2022-09/msg00015.html
|
||
|
|
Problem also reported by Bruce Dubbs in
|
||
|
|
https://lists.gnu.org/archive/html/bug-autoconf/2022-09/msg00010.html
|
||
|
|
|
||
|
|
* tests/local.at (_AT_CHECK_ENV, AT_CONFIG_CMP): Ignore changes in
|
||
|
|
value of SHLVL.
|
||
|
|
Copyright-paperwork-exempt: yes
|
||
|
|
|
||
|
|
Conflicts:
|
||
|
|
tests/local.at
|
||
|
|
(First block needed Fuzz 2, other blocks needed offset)
|
||
|
|
---
|
||
|
|
tests/local.at | 6 ++++--
|
||
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/tests/local.at b/tests/local.at
|
||
|
|
index b5e68d37..e602c12b 100644
|
||
|
|
--- a/tests/local.at
|
||
|
|
+++ b/tests/local.at
|
||
|
|
@@ -352,7 +352,7 @@ m4_define([AT_CHECK_CONFIGURE],
|
||
|
|
# - AC_SUBST'ed variables
|
||
|
|
# (FIXME: Generate a list of these automatically.)
|
||
|
|
# - _|@|.[*#?$].|argv|ARGC|LINENO|OLDPWD|PIPESTATUS|RANDOM|SECONDS
|
||
|
|
-# |START_TIME|ToD|_AST_FEATURES
|
||
|
|
+# |SHLVL|START_TIME|ToD|_AST_FEATURES
|
||
|
|
# Some variables some shells use and change.
|
||
|
|
# `.[*#?$].' catches `$#' etc. which are displayed like this:
|
||
|
|
# | '!'=18186
|
||
|
|
@@ -403,7 +403,7 @@ if test -f state-env.before && test -f state-env.after; then
|
||
|
|
[GREP|[EF]GREP|SED],
|
||
|
|
[[_@]|.[*@%:@?$].],
|
||
|
|
[argv|ARGC|LINENO|BASH_ARGC|BASH_ARGV|OLDPWD|PIPESTATUS|RANDOM],
|
||
|
|
- [SECONDS|START_TIME|ToD|_AST_FEATURES]))=' \
|
||
|
|
+ [SECONDS|SHLVL|START_TIME|ToD|_AST_FEATURES]))=' \
|
||
|
|
$act_file ||
|
||
|
|
test $? -eq 1 || echo failed >&2
|
||
|
|
) 2>stderr-$act_file |
|
||
|
|
@@ -434,6 +434,7 @@ fi
|
||
|
|
# - PPID [bash, zsh]
|
||
|
|
# - RANDOM [bash, zsh]
|
||
|
|
# - SECONDS [bash, zsh]
|
||
|
|
+# - SHLVL [bash]
|
||
|
|
# - START_TIME [NetBSD sh]
|
||
|
|
# - ToD [NetBSD sh]
|
||
|
|
# - '$' [zsh]
|
||
|
|
@@ -481,6 +482,7 @@ do
|
||
|
|
/^PPID=/ d
|
||
|
|
/^RANDOM=/ d
|
||
|
|
/^SECONDS=/ d
|
||
|
|
+ /^SHLVL=/ d
|
||
|
|
/^START_TIME=/ d
|
||
|
|
/^ToD=/ d
|
||
|
|
/'\'\\\$\''=/ d
|
||
|
|
--
|
||
|
|
2.37.3
|
||
|
|
|