diff options
| -rw-r--r-- | debian/patches/fix-V14system.ztst-with-zsh-static.patch | 20 | ||||
| -rw-r--r-- | debian/patches/hopefully-fix-testsuite-failures.patch | 31 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
3 files changed, 0 insertions, 53 deletions
diff --git a/debian/patches/fix-V14system.ztst-with-zsh-static.patch b/debian/patches/fix-V14system.ztst-with-zsh-static.patch deleted file mode 100644 index b646d91f5..000000000 --- a/debian/patches/fix-V14system.ztst-with-zsh-static.patch +++ /dev/null @@ -1,20 +0,0 @@ -Description: Fix autopkgtest with zsh-static due to (correct) warning on STDERR -Author: Jun T <takimoto-j@kba.biglobe.ne.jp> -Origin: https://zsh.org/workers/50052 - -diff --git a/Test/V14system.ztst b/Test/V14system.ztst -index 100daab08..ffdb730a4 100644 ---- a/Test/V14system.ztst -+++ b/Test/V14system.ztst -@@ -5,10 +5,10 @@ - if zmodload -s zsh/system && zmodload -s zsh/zselect; then - tst_dir=V14.tmp - mkdir -p -- $tst_dir -+ : > $tst_dir/file # File on which to acquire flock. - else - ZTST_unimplemented='the zsh/system and zsh/zselect modules are not available' - fi -- : > $tst_dir/file # File on which to acquire flock. - - %test - diff --git a/debian/patches/hopefully-fix-testsuite-failures.patch b/debian/patches/hopefully-fix-testsuite-failures.patch deleted file mode 100644 index 56472f98e..000000000 --- a/debian/patches/hopefully-fix-testsuite-failures.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 7f269d00e..ecbc384c5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,5 +4,3 @@ cross-compile.diff example-shebang.patch completion-dscverify.diff use-pager-instead-of-more-by-default.patch -hopefully-fix-testsuite-failures.patch -fix-V14system.ztst-with-zsh-static.patch |