summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/patches/further-mitigate-test-suite-hangs.patch17
-rw-r--r--debian/patches/series1
2 files changed, 18 insertions, 0 deletions
diff --git a/debian/patches/further-mitigate-test-suite-hangs.patch b/debian/patches/further-mitigate-test-suite-hangs.patch
new file mode 100644
index 000000000..887b8d51a
--- /dev/null
+++ b/debian/patches/further-mitigate-test-suite-hangs.patch
@@ -0,0 +1,17 @@
+Origin: http://www.zsh.org/mla/workers/2014/msg01250.html
+Author: Bart Schaefer <schaefer@brasslantern.com>
+Bug-Debian: https://bugs.debian.org/759870
+Description: Add a sleep call which should prevent a race condition in coproc
+
+diff --git a/Test/A05execution.ztst b/Test/A05execution.ztst
+index ca97f4f..0b40a73 100644
+--- a/Test/A05execution.ztst
++++ b/Test/A05execution.ztst
+@@ -208,6 +208,7 @@ F:This similar test was triggering a reproducible failure with pipestatus.
+ print -u $ZTST_fd 'This test takes 5 seconds to fail...'
+ { printf "%d\n" {1..20000} } | ( read -e )
+ hang(){ printf "%d\n" {2..20000} | cat }; hang | ( read -e )
++ sleep 1 ;: avoid coproc exit race condition
+ print -p done
+ read -et 6 -p
+ 0:Bug regression: piping a shell construct to an external process may hang
diff --git a/debian/patches/series b/debian/patches/series
index f48195908..af374d2fb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ cherry-pick-22c4ea42-33403-be-conservative-about-redirecting-call-program-stderr
cherry-pick-605a73e4-33429-disallow-non-integer-values-for-histsize-and-savehist-of-fc-p-and-fix-crash-on-zero-values-for-same.patch
cherry-pick-521313b4-tests-for-workers-33429.patch
cherry-pick-2d14c085-33445-fix-handling-of-s-when-combined-with-i-at-shell-invocation.patch
+further-mitigate-test-suite-hangs.patch