diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2017-02-20 13:24:55 -0800 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2017-02-20 13:26:50 -0800 |
| commit | 79005f1b794d9d9a5de7fb22a6f5ca4f2c730382 (patch) | |
| tree | ec5ea1dfecc30810226e292fb9831d5b2aee074f | |
| parent | 74fe4d0950d5db0bba9d8ec182c4a827728cff60 (diff) | |
| download | zsh-79005f1b794d9d9a5de7fb22a6f5ca4f2c730382.tar.gz zsh-79005f1b794d9d9a5de7fb22a6f5ca4f2c730382.tar.xz zsh-79005f1b794d9d9a5de7fb22a6f5ca4f2c730382.zip | |
use "diff -a" in case special characters were written to the test output
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rwxr-xr-x | Test/ztst.zsh | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 60a5164d6..d06dbfb01 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2017-02-20 Barton E. Schaefer <schaefer@zsh.org> + * unposted: Test/ztst.zsh: use "diff -a" in case special characters + were written to the test output + * 40598: Src/subst.c: paramsubst() should always return scalar when PREFORK_SINGLE was passed in from prefork() diff --git a/Test/ztst.zsh b/Test/ztst.zsh index f172ae143..0b2679927 100755 --- a/Test/ztst.zsh +++ b/Test/ztst.zsh @@ -334,7 +334,7 @@ ZTST_diff() { diff_ret=1 fi else - diff_out=$(diff "$@") + diff_out=$(diff -a "$@") diff_ret="$?" if [[ "$diff_ret" != "0" ]]; then print -r -- "$diff_out" |