Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
[PATCH] test harness: Emit unified diffs instead of context diffs
- X-seq: zsh-workers 38652
- From: Daniel Shahaf <d.s@xxxxxxxxxxxxxxxxxx>
- To: zsh-workers@xxxxxxx
- Subject: [PATCH] test harness: Emit unified diffs instead of context diffs
- Date: Fri, 10 Jun 2016 17:36:55 +0000
- List-help: <mailto:zsh-workers-help@zsh.org>
- List-id: Zsh Workers List <zsh-workers.zsh.org>
- List-post: <mailto:zsh-workers@zsh.org>
- Mailing-list: contact zsh-workers-help@xxxxxxx; run by ezmlm
---
Does anyone build zsh on a system that doesn't have a working 'diff -u'?
Test/ztst.zsh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Test/ztst.zsh b/Test/ztst.zsh
index cdd84b5..8ae06b8 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
Messages sorted by:
Reverse Date,
Date,
Thread,
Author