summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAxel Beckert <abe@deuxchevaux.org>2014-10-13 22:42:31 +0200
committerAxel Beckert <abe@deuxchevaux.org>2014-10-13 22:42:31 +0200
commit4a370a5f43981aaf409bfa7865a8c86fb34c0e30 (patch)
treec2eac6e9b75c0d32183f540b3807fa66d393f6ea
parent6f309d99e7b9b8c366a09d44762188e796552c42 (diff)
downloadzsh-4a370a5f43981aaf409bfa7865a8c86fb34c0e30.tar.gz
zsh-4a370a5f43981aaf409bfa7865a8c86fb34c0e30.zip
Cherry-pick 521313b4 (Tests for workers/33429) from upstream
-rw-r--r--debian/patches/cherry-pick-521313b4-tests-for-workers-33429.patch27
-rw-r--r--debian/patches/series1
2 files changed, 28 insertions, 0 deletions
diff --git a/debian/patches/cherry-pick-521313b4-tests-for-workers-33429.patch b/debian/patches/cherry-pick-521313b4-tests-for-workers-33429.patch
new file mode 100644
index 000000000..fdb55831e
--- /dev/null
+++ b/debian/patches/cherry-pick-521313b4-tests-for-workers-33429.patch
@@ -0,0 +1,27 @@
+Origin: commit 521313b4b95817c9144ab43ab121da934f99bd51
+Author: Barton E. Schaefer <schaefer@zsh.org>
+Date: Sat Oct 11 11:18:34 2014 -0700
+Description: Tests for workers/33429
+
+diff --git a/Test/B06fc.ztst b/Test/B06fc.ztst
+index eb73eaa..65ee43d 100644
+--- a/Test/B06fc.ztst
++++ b/Test/B06fc.ztst
+@@ -9,3 +9,17 @@
+ $ZTST_testdir/../Src/zsh -f ./fcl
+ 1:Checking that fc -l foo doesn't core dump when history is empty
+ ?./fcl:fc:1: event not found: foo
++
++ $ZTST_testdir/../Src/zsh +Z -fsi <<< $'fc -p /dev/null 0 0\n:'
++0:Checking that fc -p doesn't core dump when history size is zero
++*?*%*
++
++ $ZTST_testdir/../Src/zsh +Z -fsi <<< 'fc -p /dev/null a 0'
++1:Checking that fc -p rejects non-integer history size
++*?*% fc: HISTSIZE must be an integer
++*?*%*
++
++ $ZTST_testdir/../Src/zsh +Z -fsi <<< 'fc -p /dev/null 0 a'
++1:Checking that fc -p rejects non-integer history save size
++*?*% fc: SAVEHIST must be an integer
++*?*%*
diff --git a/debian/patches/series b/debian/patches/series
index b66fd3099..315656f32 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ cherry-pick-0f73b35f-33391-vcs-info-git-fix-applied-patch-detection-on-git-am.pa
cherry-pick-a03227de-33405-vcs-info-make-sure-maxexports-is-set-when-vcs-info-set-is-called.patch
cherry-pick-22c4ea42-33403-be-conservative-about-redirecting-call-program-stderr-the-caller-may-have-already-done-so.patch
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