mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-10-14 11:41:07 +02:00
37243: too many problems with inserting a line into B02, instead add a placeholder and substitute for it.
unposted: %cleanup block is not called when %prep sets ZTST_unimplemented, so avoid leaving a mess
This commit is contained in:
parent
3d962aacd5
commit
026cb6a812
3 changed files with 14 additions and 5 deletions
|
@ -1,3 +1,12 @@
|
||||||
|
2015-11-27 Barton E. Schaefer <schaefer@zsh.org>
|
||||||
|
|
||||||
|
* unposted: Test/V10private.ztst: %cleanup block is not called when
|
||||||
|
%prep sets ZTST_unimplemented, so avoid leaving a mess
|
||||||
|
|
||||||
|
* 37243: Test/B02typeset.ztst, Test/V10private.ztst: too many
|
||||||
|
problems with inserting a line into B02, instead add a placeholder
|
||||||
|
and substitute for it.
|
||||||
|
|
||||||
2015-11-26 Barton E. Schaefer <schaefer@zsh.org>
|
2015-11-26 Barton E. Schaefer <schaefer@zsh.org>
|
||||||
|
|
||||||
* 37229: Src/Modules/param_private.c, Test/V10private.ztst: non-
|
* 37229: Src/Modules/param_private.c, Test/V10private.ztst: non-
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
# Assorted illegal flag combinations
|
# Assorted illegal flag combinations
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
|
# test_zsh_param_private
|
||||||
|
|
||||||
mkdir typeset.tmp && cd typeset.tmp
|
mkdir typeset.tmp && cd typeset.tmp
|
||||||
|
|
||||||
|
|
|
@ -4,12 +4,11 @@
|
||||||
|
|
||||||
if ! zmodload zsh/param/private 2>/dev/null; then
|
if ! zmodload zsh/param/private 2>/dev/null; then
|
||||||
ZTST_unimplemented="can't load the zsh/param/private module for testing"
|
ZTST_unimplemented="can't load the zsh/param/private module for testing"
|
||||||
fi
|
else
|
||||||
|
|
||||||
# Do not use .tmp here, ztst.zsh will remove it too soon (see %cleanup)
|
# Do not use .tmp here, ztst.zsh will remove it too soon (see %cleanup)
|
||||||
mkdir private.TMP
|
mkdir private.TMP
|
||||||
sed '/^%prep/a\
|
sed -e 's,# test_zsh_param_private,zmodload zsh/param/private,' < $ZTST_srcdir/B02typeset.ztst > private.TMP/B02
|
||||||
zmodload zsh/param/private' < $ZTST_srcdir/B02typeset.ztst > private.TMP/B02
|
fi
|
||||||
|
|
||||||
%test
|
%test
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue