summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorAxel Beckert <abe@deuxchevaux.org>2022-04-12 10:51:22 +0200
committerAxel Beckert <abe@deuxchevaux.org>2022-04-12 10:51:22 +0200
commit74ff1f90b91a50d654dd311e1cded1b100e99049 (patch)
tree27ae72b3aeacef1244246536725498874e0e3821 /debian/patches
parent448c951af95e6419a0c7212382d6d67ce0f45133 (diff)
downloadzsh-74ff1f90b91a50d654dd311e1cded1b100e99049.tar.gz
zsh-74ff1f90b91a50d654dd311e1cded1b100e99049.zip
Add patch from Jun T to export LANG when running D07multibyte.ztst
Hopefully fixes FTBFS on most architectures due to test suite failures.
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/hopefully-fix-testsuite-failures.patch31
-rw-r--r--debian/patches/series1
2 files changed, 32 insertions, 0 deletions
diff --git a/debian/patches/hopefully-fix-testsuite-failures.patch b/debian/patches/hopefully-fix-testsuite-failures.patch
new file mode 100644
index 000000000..56472f98e
--- /dev/null
+++ b/debian/patches/hopefully-fix-testsuite-failures.patch
@@ -0,0 +1,31 @@
+Origin: https://zsh.org/workers/50046
+Author: Jun T <takimoto-j@kba.biglobe.ne.jp>
+Description: Set LANG to hopefully make D07multibyte.ztst pass
+
+It failed on the buildds as well as on Salsa runners, but neither
+locally not in pbuilder. Upstream suspects that LANG needs to be set
+(correctly) to pass.
+
+Original comment by Jun:
+
+I've found that the test Xpassed if LANG was unset:
+
+% unset LANG
+% make TESTNUM=D07 check
+./D07multibyte.ztst: test XPassed.
+
+It seems we need to export LANG (in ztst.zsh) to pass it to
+$ZTST_testdir/../Src/zsh.
+
+diff --git a/Test/ztst.zsh b/Test/ztst.zsh
+index 89fe69b5b..263573333 100755
+--- a/Test/ztst.zsh
++++ b/Test/ztst.zsh
+@@ -30,6 +30,7 @@ emulate -R zsh
+ [[ -n $LC_NUMERIC ]] && LC_NUMERIC=C
+ [[ -n $LC_MESSAGES ]] && LC_MESSAGES=C
+ [[ -n $LANG ]] && LANG=C
++export LANG
+
+ # Don't propagate variables that are set by default in the shell.
+ typeset +x WORDCHARS
diff --git a/debian/patches/series b/debian/patches/series
index ecbc384c5..e9046d2fb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ cross-compile.diff
example-shebang.patch
completion-dscverify.diff
use-pager-instead-of-more-by-default.patch
+hopefully-fix-testsuite-failures.patch