summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@zsh.org>2013-10-24 17:31:02 +0100
committerPeter Stephenson <pws@zsh.org>2013-10-24 17:31:02 +0100
commit59b060bd5bf2ca08f43f5a0e308a231494e0efd6 (patch)
tree23485742f64ff9a267323935997b7e2ab5e976f7
parent65e131c838be6a300b41e3fa8259c281714e4918 (diff)
downloadzsh-59b060bd5bf2ca08f43f5a0e308a231494e0efd6.tar.gz
zsh-59b060bd5bf2ca08f43f5a0e308a231494e0efd6.tar.xz
zsh-59b060bd5bf2ca08f43f5a0e308a231494e0efd6.zip
31884: Make new pipestatus test implementation proof.
It seems uniq's vary in the number of spaces they output.
-rw-r--r--ChangeLog5
-rw-r--r--Test/A05execution.ztst4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6eb21a194..e8e69ae1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-24  Peter Stephenson  <p.stephenson@samsung.com>
+
+	* 31884: Test/A05execution.ztst: eliminate variable output
+	from test due to vagaries of uniq implementation.
+
 2013-10-23  Barton E. Schaefer  <schaefer@zsh.org>
 
 	* 31879: Src/jobs.c: improve $pipestatus behavior when the last
diff --git a/Test/A05execution.ztst b/Test/A05execution.ztst
index c42e454f3..fd13e9134 100644
--- a/Test/A05execution.ztst
+++ b/Test/A05execution.ztst
@@ -184,8 +184,8 @@
                            done;
                    print "${pipestatus[@]}")
 	ZTST_hashmark
-  done | sort | uniq -c
+  done | sort | uniq -c | sed 's/^ *//'
 0:Check whether `$pipestatus[]' behaves.
->   2048 0 0 0
+>2048 0 0 0
 F:This test checks for a bug in `$pipestatus[]' handling.  If it breaks then
 F:the bug is still there or it reappeared. See workers-29973 for details.