summary refs log tree commit diff
diff options
context:
space:
mode:
authorBarton E. Schaefer <schaefer@zsh.org>2015-11-26 09:30:05 -0800
committerBarton E. Schaefer <schaefer@zsh.org>2015-11-26 09:30:05 -0800
commit2bab9f0394e5642e8a72511ba846d0faffe4e69f (patch)
tree270c719ca3439b3dc34558bc64a85afb55681173
parente4aec8c19739bf100cfa304708b7975d340a2772 (diff)
downloadzsh-2bab9f0394e5642e8a72511ba846d0faffe4e69f.tar.gz
zsh-2bab9f0394e5642e8a72511ba846d0faffe4e69f.tar.xz
zsh-2bab9f0394e5642e8a72511ba846d0faffe4e69f.zip
37225: fix test for typeset with zsh/param/private
-rw-r--r--ChangeLog2
-rw-r--r--Test/V10private.ztst11
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 132ed20dd..b6d4b52fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2015-11-26  Barton E. Schaefer  <schaefer@zsh.org>
 
+	* 37225: Test/V10private.ztst: fix test from 37208
+
 	* 37224: Test/B02typeset.ztst: delete obsolete comment
 
 2015-11-26  Peter Stephenson  <p.stephenson@samsung.com>
diff --git a/Test/V10private.ztst b/Test/V10private.ztst
index f877455fd..d5bee5e88 100644
--- a/Test/V10private.ztst
+++ b/Test/V10private.ztst
@@ -6,12 +6,17 @@
    ZTST_unimplemented="can't load the zsh/param/private module for testing"
  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)
 0:unload and reload the module without crashing
 
- $ZTST_exe +Z -f $ZTST_srcdir/ztst.zsh $ZTST_srcdir/B02typeset.ztst
+ ZTST_verbose=0 $ZTST_exe +Z -f $ZTST_srcdir/ztst.zsh private.TMP/B02
 0:typeset still works with zsh/param/private module loaded
 *>*
 *>*
@@ -270,3 +275,7 @@ F:note "typeset" rather than "private" in output from outer
 
  () { private -h SECONDS }
 0:private parameter may hide a special parameter
+
+%clean
+
+  rm -r private.TMP