From 14dbc20b026a9ffa3f331995e89cd5cacaaf93a0 Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <d.s@daniel.shahaf.name>
Date: Fri, 10 Jun 2016 17:36:55 +0000
Subject: 38652: test harness: Emit unified diffs instead of context diffs

---
 ChangeLog     | 5 +++++
 Test/ztst.zsh | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b2a8ee585..76cb77e58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-06-25  Daniel Shahaf  <d.s@daniel.shahaf.name>
+
+	* 38652: Test/ztst.zsh: test harness: Emit unified diffs instead
+	of context diffs
+
 2016-06-22  Oliver Kiddle  <opk@zsh.org>
 
 	* 38749: Functions/Zle/surround, Functions/Zle/select-bracketed:
diff --git a/Test/ztst.zsh b/Test/ztst.zsh
index cdd84b55d..8ae06b832 100755
--- a/Test/ztst.zsh
+++ b/Test/ztst.zsh
@@ -333,7 +333,7 @@ ZTST_diff() {
     diff_out=$(diff "$@")
     diff_ret="$?"
     if [[ "$diff_ret" != "0" ]]; then
-      print -r "$diff_out"
+      print -r -- "$diff_out"
     fi
   fi
 
@@ -458,7 +458,7 @@ $(<$ZTST_terr)"
 	rm -rf $ZTST_out
 	print -r -- "${(e)substlines}" >$ZTST_out
       fi
-      if [[ $ZTST_flags != *d* ]] && ! ZTST_diff $diff_out -c $ZTST_out $ZTST_tout; then
+      if [[ $ZTST_flags != *d* ]] && ! ZTST_diff $diff_out -u $ZTST_out $ZTST_tout; then
 	ZTST_testfailed "output differs from expected as shown above for:
 $ZTST_code${$(<$ZTST_terr):+
 Error output:
@@ -470,7 +470,7 @@ $(<$ZTST_terr)}"
 	rm -rf $ZTST_err
 	print -r -- "${(e)substlines}" >$ZTST_err
       fi
-      if [[ $ZTST_flags != *D* ]] && ! ZTST_diff $diff_err -c $ZTST_err $ZTST_terr; then
+      if [[ $ZTST_flags != *D* ]] && ! ZTST_diff $diff_err -u $ZTST_err $ZTST_terr; then
 	ZTST_testfailed "error output differs from expected as shown above for:
 $ZTST_code"
 	return 1
-- 
cgit 1.4.1