diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | Completion/Unix/Command/_sysctl | 14 | ||||
| -rw-r--r-- | Test/B02typeset.ztst | 2 | ||||
| -rw-r--r-- | Test/V10private.ztst | 11 |
4 files changed, 29 insertions, 9 deletions
@@ -1,3 +1,14 @@ +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> + + * Matthew Martin: 37100: Completion/Unix/Command/_sysctl: + updates. + 2015-11-25 Peter Stephenson <p.w.stephenson@ntlworld.com> * unposted: Config/version.mk: 5.1.1-test-2 diff --git a/Completion/Unix/Command/_sysctl b/Completion/Unix/Command/_sysctl index ff3312fac..9d9e8b968 100644 --- a/Completion/Unix/Command/_sysctl +++ b/Completion/Unix/Command/_sysctl @@ -34,13 +34,13 @@ case $OSTYPE in '(-n -p -a -A)*:sysctl variable:_files -W /proc/sys' ;; openbsd*) - : ${(A)_cache_sysctlvars:=${${(f)"$(sysctl -a)"}%% *}} - _arguments -s -A "-*" \ - '(-w -A *)-a[list all string and integer variables]' \ - '(-w -a *)-A[list all known variables]' \ - '(-w)-n[show only values]' \ - '(-a -A -n)-w[write variable]' \ - '(-a -A)*:sysctl variable:_multi_parts ${words[(r)-w]:+-S=} -i . _cache_sysctlvars' + : ${(A)_cache_sysctlvars:=${${${(f)"$(sysctl -a 2>/dev/null)"}%%=*}:# *}} + _arguments -S -s -A "-*" \ + '(-A -q *)-a[list all string and integer variables]' \ + '(-a -q *)-A[list all known variables]' \ + '-n[show only values]' \ + '(-a -A)-q[suppress all output when setting a variable]' \ + '(-a -A)*:sysctl variable:_multi_parts -i -S = -q . _cache_sysctlvars' ;; *) _default diff --git a/Test/B02typeset.ztst b/Test/B02typeset.ztst index 2b8e5445c..0aa16d2e3 100644 --- a/Test/B02typeset.ztst +++ b/Test/B02typeset.ztst @@ -4,7 +4,7 @@ # Equivalences: # declare typeset -# export typeset -x and typeset -x implies -g +# export typeset -x # float typeset -E # functions typeset -f # integer typeset -i 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 |