about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2011-12-02 10:27:13 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2011-12-02 10:27:13 +0000
commit5d949f9cda0bb65f08d1d4f695334809a7a3482d (patch)
tree903185c080b14343f4150fdbc4c5c4e54413af23
parentae8e3ba86d675e13d70e9bf26bf88620bebb096d (diff)
downloadzsh-5d949f9cda0bb65f08d1d4f695334809a7a3482d.tar.gz
zsh-5d949f9cda0bb65f08d1d4f695334809a7a3482d.tar.xz
zsh-5d949f9cda0bb65f08d1d4f695334809a7a3482d.zip
unposted: fix documentation for "*" test output syntax
-rw-r--r--ChangeLog7
-rw-r--r--Test/B01cd.ztst20
2 files changed, 16 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index c129aa21b..4bf1f0bdd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-02  Peter Stephenson  <pws@csr.com>
+
+	* unposted: Test/B01cd.ztst: fix documentation for '*'
+	test output syntax.
+
 2011-12-01  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* 29924: Test/A04redirect.ztst, Test/B01cd.ztst, Test/ztst.zsh:
@@ -15640,5 +15645,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5512 $
+* $Revision: 1.5513 $
 *****************************************************
diff --git a/Test/B01cd.ztst b/Test/B01cd.ztst
index e178495a9..a169ba059 100644
--- a/Test/B01cd.ztst
+++ b/Test/B01cd.ztst
@@ -53,17 +53,17 @@
 # stderr.
 #
 # The rules for '<', '>' and '?' lines are the same: only the first
-# character is stripped, with subsequent whitespace being significant;
-# lines are not subject to any substitution unless the `q' flag (see
-# below) is set.
+# character is stripped (with the excpetion for '*' noted below), with
+# subsequent whitespace being significant; lines are not subject to any
+# substitution unless the `q' flag (see below) is set.
 #
-# '>' and '?' may be preceded by a '*', in which case all lines
-# in the chunk must be so delimited (i.e. all lines must start either
-# '*>' or '>' but not a mixture).  If the '*' is present, the lines
-# in the actual output are pattern matched against the lines in the
-# test output.  The entire line following '*>' or '*?' must be a
-# valid pattern, so characters special to patterns such as parentheses
-# must be quoted.  The EXTENDED_GLOB option is used for all such patterns.
+# The first line (only) of a '>' and '?' chunk may be preceded by a '*'.
+# This signifies that all lines in the chunk (not just the one with the
+# '*' in front) in the actual output are pattern matched against the
+# corresponding lines in the test output.  The entire set of lines
+# following '>' or '?' must be a valid pattern, so characters special to
+# patterns such as parentheses must be quoted.  The EXTENDED_GLOB option
+# is used for all such patterns.
 #
 # Each chunk of indented code is to be evaluated in one go and is to
 # be followed by a line starting (in the first column) with