about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaniel Shahaf <danielsh@apache.org>2020-03-09 01:55:10 +0000
committerDaniel Shahaf <danielsh@apache.org>2020-03-09 01:56:26 +0000
commit1602016d530d76a0c924b297e05ef3dd9b6c4105 (patch)
tree044c85383464f03d71e6554107794cd6cdc93549
parentb5f05b29ba3d8884cdcb344fd6e5f62aeaa9a3fc (diff)
downloadzsh-1602016d530d76a0c924b297e05ef3dd9b6c4105.tar.gz
zsh-1602016d530d76a0c924b297e05ef3dd9b6c4105.tar.xz
zsh-1602016d530d76a0c924b297e05ef3dd9b6c4105.zip
45518 + unposted tweak (change single quotes to double quotes): Fix V01zmotload.ztst test failures when zsh/parameter is dynamically linked (which is the default).
-rw-r--r--ChangeLog6
-rw-r--r--Test/V01zmodload.ztst33
2 files changed, 25 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 23d70c410..096ca9657 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2020-03-09  Daniel Shahaf  <danielsh@apache.org>
+
+	* 45518 + unposted tweak (change single quotes to double quotes):
+	Test/V01zmodload.ztst: Fix V01zmotload.ztst test failures when
+	zsh/parameter is dynamically linked (which is the default).
+
 2020-03-07  Daniel Shahaf  <danielsh@apache.org>
 
 	* unposted: README: Move a new incompatibility notice.
diff --git a/Test/V01zmodload.ztst b/Test/V01zmodload.ztst
index c3c64a79d..0a7fbb651 100644
--- a/Test/V01zmodload.ztst
+++ b/Test/V01zmodload.ztst
@@ -348,44 +348,49 @@
 ?(eval):6: unknown function: systell
 ?(eval):9: file descriptor out of range
 
- $ZTST_testdir/../Src/zsh -fc '
+ $ZTST_testdir/../Src/zsh -fc "
+   MODULE_PATH=${(q)MODULE_PATH}
    if zmodload -e zsh/parameter; then zmodload -u zsh/parameter; fi
    unset options
    zmodload zsh/parameter
-   echo $+options
- '
+   echo \$+options
+ "
 -f:can unset a non-readonly autoloadable parameter before loading the module
 >0
 # Currently prints '1'.
 
- $ZTST_testdir/../Src/zsh -fc '
+ $ZTST_testdir/../Src/zsh -fc "
+   MODULE_PATH=${(q)MODULE_PATH}
    zmodload zsh/parameter
    unset options
-   echo $+options
- '
+   echo \$+options
+ "
 0:can unset a non-readonly autoloadable parameter after loading the module
 >0
 
- $ZTST_testdir/../Src/zsh -fc '
+ $ZTST_testdir/../Src/zsh -fc "
+   MODULE_PATH=${(q)MODULE_PATH}
    if zmodload -e zsh/parameter; then zmodload -u zsh/parameter; fi
    unset builtins
- '
+ "
 -f:can't unset a readonly autoloadable parameter before loading the module
 *?zsh:?: read-only variable: builtins
 # Currently, the 'unset' succeeds.
 
- $ZTST_testdir/../Src/zsh -fc '
+ $ZTST_testdir/../Src/zsh -fc "
+   MODULE_PATH=${(q)MODULE_PATH}
    zmodload zsh/parameter
    unset builtins
- '
+ "
 1:can't unset a readonly autoloadable parameter after loading the module
-?zsh:3: read-only variable: builtins
+*?zsh:?: read-only variable: builtins
 
- $ZTST_testdir/../Src/zsh -fc '
+ $ZTST_testdir/../Src/zsh -fc "
+   MODULE_PATH=${(q)MODULE_PATH}
    zmodload zsh/parameter
    zmodload -u zsh/parameter
-   echo $options
- '
+   echo \$options
+ "
 0:unloading a module doesn't implicitly unset autoloadable parameters
 *>(on|off) *