diff options
| author | Oliver Kiddle <opk@zsh.org> | 2023-12-13 11:40:03 +0100 |
|---|---|---|
| committer | Oliver Kiddle <opk@zsh.org> | 2023-12-13 11:40:03 +0100 |
| commit | 10c3ed20c7068a0564a812ddc232c8f35500813d (patch) | |
| tree | 6e93c348d04cf2693e7b91c047e215293dc8169a | |
| parent | 52392: use octal escape to match = without error messages from awk (diff) | |
| download | zsh-10c3ed20c7068a0564a812ddc232c8f35500813d.tar zsh-10c3ed20c7068a0564a812ddc232c8f35500813d.tar.gz zsh-10c3ed20c7068a0564a812ddc232c8f35500813d.tar.bz2 zsh-10c3ed20c7068a0564a812ddc232c8f35500813d.tar.lz zsh-10c3ed20c7068a0564a812ddc232c8f35500813d.tar.xz zsh-10c3ed20c7068a0564a812ddc232c8f35500813d.tar.zst zsh-10c3ed20c7068a0564a812ddc232c8f35500813d.zip | |
52393: fix tests on Solaris by omitting -a option to diff as it is not supported there
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rwxr-xr-x | Test/ztst.zsh | 4 |
2 files changed, 6 insertions, 1 deletions
@@ -1,5 +1,8 @@ 2023-12-13 Oliver Kiddle <opk@zsh.org> + * 52393: Test/ztst.zsh: fix tests on Solaris by omitting -a option + to diff as it is not supported there + * 52392: Src/makepro.awk: use octal escape to match = without error messages from either GNU awk or Solaris awk diff --git a/Test/ztst.zsh b/Test/ztst.zsh index ea1b016d5..1d05baddf 100755 --- a/Test/ztst.zsh +++ b/Test/ztst.zsh @@ -326,6 +326,7 @@ ZTST_diff() { emulate -L zsh setopt extendedglob + local -a diff_arg local diff_out integer diff_pat diff_ret @@ -342,6 +343,7 @@ ZTST_diff() { ;; esac shift + [[ $OSTYPE != solaris* ]] && diff_arg=( -a ) if (( diff_pat )); then local -a diff_lines1 diff_lines2 @@ -382,7 +384,7 @@ ZTST_diff() { diff_ret=1 fi else - diff_out=$(diff -a "$@") + diff_out=$(diff $diff_arg "$@") diff_ret="$?" if [[ "$diff_ret" != "0" ]]; then print -r -- "$diff_out" |