diff options
| author | Daniel Shahaf <d.s@daniel.shahaf.name> | 2016-06-10 17:36:55 +0000 |
|---|---|---|
| committer | Daniel Shahaf <d.s@daniel.shahaf.name> | 2016-06-25 16:32:27 +0000 |
| commit | 14dbc20b026a9ffa3f331995e89cd5cacaaf93a0 (patch) | |
| tree | c66475df00b32bcaf1ee29552d87b1297535a835 /Test/ztst.zsh | |
| parent | 76f28cc908b8c7ce72bc54496c5af74f6ca29c63 (diff) | |
| download | zsh-14dbc20b026a9ffa3f331995e89cd5cacaaf93a0.tar.gz zsh-14dbc20b026a9ffa3f331995e89cd5cacaaf93a0.zip | |
38652: test harness: Emit unified diffs instead of context diffs
Diffstat (limited to 'Test/ztst.zsh')
| -rwxr-xr-x | Test/ztst.zsh | 6 |
1 files changed, 3 insertions, 3 deletions
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 |