From 026cb6a8127dfb9a6277ec42cc251ebc77e1300e Mon Sep 17 00:00:00 2001 From: "Barton E. Schaefer" Date: Fri, 27 Nov 2015 11:20:33 -0800 Subject: 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 --- ChangeLog | 9 +++++++++ Test/B02typeset.ztst | 1 + Test/V10private.ztst | 9 ++++----- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index a1034cfcc..aee919de0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2015-11-27 Barton E. Schaefer + + * 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 * 37229: Src/Modules/param_private.c, Test/V10private.ztst: non- diff --git a/Test/B02typeset.ztst b/Test/B02typeset.ztst index 1b8caee0a..954ae32f5 100644 --- a/Test/B02typeset.ztst +++ b/Test/B02typeset.ztst @@ -21,6 +21,7 @@ # Assorted illegal flag combinations %prep + # test_zsh_param_private mkdir typeset.tmp && cd typeset.tmp diff --git a/Test/V10private.ztst b/Test/V10private.ztst index bb456f2ea..513a3c43d 100644 --- a/Test/V10private.ztst +++ b/Test/V10private.ztst @@ -4,13 +4,12 @@ if ! zmodload zsh/param/private 2>/dev/null; then ZTST_unimplemented="can't load the zsh/param/private module for testing" + else + # Do not use .tmp here, ztst.zsh will remove it too soon (see %cleanup) + mkdir private.TMP + sed -e 's,# test_zsh_param_private,zmodload zsh/param/private,' < $ZTST_srcdir/B02typeset.ztst > private.TMP/B02 fi - # Do not use .tmp here, ztst.zsh will remove it too soon (see %cleanup) - mkdir private.TMP - sed '/^%prep/a\ - zmodload zsh/param/private' < $ZTST_srcdir/B02typeset.ztst > private.TMP/B02 - %test (zmodload -u zsh/param/private && zmodload zsh/param/private) -- cgit 1.4.1