From b7b67d456e40183d952fa0c7793367ebbc6e320c Mon Sep 17 00:00:00 2001
From: Peter Stephenson
Date: Sat, 20 Jun 2015 19:59:11 +0100
Subject: Fix remaining existing tests.
XTRACE output for builtins with assignment arguments added.
Note difference as the output is assignment-like too:
'foo=bar'
now appears as
foo='bar'
Remove stupid "int htok" that stopped name part of scalar being expanded.
Rewrite KSH_TYPESET test to use old builtin interface where this applies.
---
Test/D01prompt.ztst | 2 +-
Test/E01options.ztst | 11 +++++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
(limited to 'Test')
diff --git a/Test/D01prompt.ztst b/Test/D01prompt.ztst
index 3074efe60..2638e2438 100644
--- a/Test/D01prompt.ztst
+++ b/Test/D01prompt.ztst
@@ -199,5 +199,5 @@
?+zsh_directory_name:4> [[ d == n ]]
?+zsh_directory_name:12> [[ /very_long_directory_name == (#b)(*)/very_long_directory_name ]]
?+zsh_directory_name:14> return 0
-?+fn:7> local 'd=~[:l]'
+?+fn:7> local d='~[:l]'
?+fn:8> print '~[:l]'
diff --git a/Test/E01options.ztst b/Test/E01options.ztst
index d64f7ac68..ca3f06ca8 100644
--- a/Test/E01options.ztst
+++ b/Test/E01options.ztst
@@ -570,6 +570,15 @@
>unset
>globassign
+ # This test is now somewhat artificial as
+ # KSH_TYPESET only applies to the builtin
+ # interface. Tests to the more standard
+ # reserved word interface appear elsewhere.
+ (
+ # reserved words are handled during parsing,
+ # hence eval...
+ disable -r typeset
+ eval '
setopt kshtypeset
ktvars=(ktv1 ktv2)
typeset ktfoo=`echo arg1 arg2` $ktvars
@@ -580,6 +589,8 @@
print $noktfoo
print $+noktarg1 $+noktarg2
unset ktfoo ktv1 ktv2 noktfoo noktarg2
+ '
+ )
0:KSH_TYPESET option
>1 1 0
>arg1 arg2
--
cgit 1.4.1