1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-07-10 04:21:37 +02:00

38652: test harness: Emit unified diffs instead of context diffs

This commit is contained in:
Daniel Shahaf 2016-06-10 17:36:55 +00:00
parent 76f28cc908
commit 14dbc20b02
2 changed files with 8 additions and 3 deletions

View file

@ -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:

View file

@ -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