From dfea11d739c4c13de9a80167c394609b40c71883 Mon Sep 17 00:00:00 2001 From: ut003808 Date: Mon, 24 Oct 2022 13:40:25 +0800 Subject: [PATCH] [build][test]Fix A05execution test case build issue --- 1001-zsh-fix-A05execution-test.patch | 28 ++++++++++++++++++++++++++++ zsh.spec | 8 +++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 1001-zsh-fix-A05execution-test.patch diff --git a/1001-zsh-fix-A05execution-test.patch b/1001-zsh-fix-A05execution-test.patch new file mode 100644 index 0000000..1d6318c --- /dev/null +++ b/1001-zsh-fix-A05execution-test.patch @@ -0,0 +1,28 @@ +diff --git a/Test/A05execution.ztst b/Test/A05execution.ztst +index 567bd25..5d3d460 100644 +--- a/Test/A05execution.ztst ++++ b/Test/A05execution.ztst +@@ -52,12 +52,17 @@ + 0:path (4) + *>foo */command.tmp/tstcmd-arg + +- path=(/bin ${ZTST_testdir}/command.tmp/) +- tstcmd-interp-too-long 2>&1; echo "status $?" +- path=($storepath) +-0:path (5) +-*>*tstcmd-interp-too-long: bad interpreter: x*xn: no such file or directory +->status 127 ++ # Just check this exits with non-zero status, ++ # as output and status code can differ. ++ ( ++ path=(/bin ${ZTST_testdir}/command.tmp/) ++ if tstcmd-interp-too-long >/dev/null 2>&1; then ++ exit 0 ++ else ++ exit 1 ++ fi ++ ) ++1:path (5) + + functst() { print $# arguments:; print -l $*; } + functst "Eines Morgens" "als Gregor Samsa" diff --git a/zsh.spec b/zsh.spec index b6002fa..08369e7 100644 --- a/zsh.spec +++ b/zsh.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.1 +%define anolis_release .0.2 Summary: Powerful interactive shell Name: zsh @@ -28,6 +28,9 @@ Patch4: 0004-zsh-5.5.1-CVE-2019-20044.patch # do not perform PROMPT_SUBST evaluation on %F/%K arguments (CVE-2021-45444) Patch5: 0005-zsh-5.5.1-CVE-2021-45444.patch +# Begin: Anolis customized patches +Patch1001: 1001-zsh-fix-A05execution-test.patch +# End: Anolis customized patches BuildRequires: autoconf BuildRequires: coreutils @@ -197,6 +200,9 @@ fi %doc Doc/*.html %changelog +* Mon Oct 24 2022 yangxianzhao - 5.5.1-9.0.2 +- Fix A05execution test case issue + * Fri Jul 15 2022 Liwei Ge - 5.5.1-9.0.1 - Add doc sub package -- Gitee