about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Test/A02alias.ztst24
-rw-r--r--Test/W01history.ztst2
3 files changed, 31 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 86d4e4c05..3cb847f69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-03-25  Barton E. Schaefer  <schaefer@zsh.org>
+
+	* 34779: Test/A02alias.ztst: tests for 34776
+
+	* unposted: Test/W01history.ztst: change an F: to a comment
+
 2015-03-25  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* Han Pingtian: 34769: incorrect description of process time
diff --git a/Test/A02alias.ztst b/Test/A02alias.ztst
index 314ec036a..fe7155e0b 100644
--- a/Test/A02alias.ztst
+++ b/Test/A02alias.ztst
@@ -57,3 +57,27 @@
 >And so is this
 >And this too
 >And aliases are expanded
+
+  $ZTST_testdir/../Src/zsh -fis <<<'
+  PROMPT=""
+  exec 2>&1
+  alias \{=echo
+  { begin
+  {end
+  fc -l -2' 2>/dev/null
+0:Aliasing reserved tokens
+>begin
+>zsh: command not found: echoend
+*>*4*{ begin
+*>*5*{end
+
+  $ZTST_testdir/../Src/zsh -fis <<<'
+  PROMPT=""
+  exec 2>&1
+  alias -g S=\"
+  echo S a string S "
+  fc -l -1' 2>/dev/null
+0:Global aliasing quotes
+> a string S 
+*>*4*echo S a string S "
+# Note there is a trailing space on the "> a string S " line
diff --git a/Test/W01history.ztst b/Test/W01history.ztst
index 3a64530c5..cfc248c15 100644
--- a/Test/W01history.ztst
+++ b/Test/W01history.ztst
@@ -16,4 +16,4 @@
 >more foo bar again
 *?*
 F:Check that a history bug introduced by workers/34160 is working again.
-F:Discarded line of error output consumes prompts printed by "zsh -i".
+# Discarded line of error output consumes prompts printed by "zsh -i".