diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2020-10-05 16:52:48 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2020-10-05 16:52:48 +0300 |
| commit | ae63acb512084b431b136be7febda9b1d05b4edf (patch) | |
| tree | 7ab80901b30bedb17d1c9e51ddfb2e8d7f74a423 | |
| parent | 0ec8cee2eb25fa994ff21703d0443e4f56f045e0 (diff) | |
| download | egawk-ae63acb512084b431b136be7febda9b1d05b4edf.tar.gz egawk-ae63acb512084b431b136be7febda9b1d05b4edf.tar.bz2 egawk-ae63acb512084b431b136be7febda9b1d05b4edf.zip | |
Improvement in 'make diffout' for Busybox.
| -rw-r--r-- | test/ChangeLog | 6 | ||||
| -rw-r--r-- | test/Makefile.am | 4 | ||||
| -rw-r--r-- | test/Makefile.in | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 8bb20553..0c913b0c 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -3,6 +3,12 @@ * iolint.awk, iolint.ok: Remove |& test to cat. It was inherently racy. + Unrelated: + + * Makefile.am (diffout): Switch to `diff -u' since Busybox + doesn't support the old -c option. Thanks to Nelson Beebe for + the report. + 2020-10-01 Arnold D. Robbins <arnold@skeeve.com> * iolint.awk, iolint.ok: Adjust output to cat for exit status diff --git a/test/Makefile.am b/test/Makefile.am index 662fdfb6..3880c5b1 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -2488,9 +2488,9 @@ diffout: echo ============== $$i ============= ; \ base=`echo $$i | sed 's/^_//'` ; \ if [ -r $${base}.ok ]; then \ - diff -c $${base}.ok $$i ; \ + diff -u $${base}.ok $$i ; \ else \ - diff -c "$(srcdir)"/$${base}.ok $$i ; \ + diff -u "$(srcdir)"/$${base}.ok $$i ; \ fi ; \ fi ; \ done | more diff --git a/test/Makefile.in b/test/Makefile.in index 9a48a003..28566ae8 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -5244,9 +5244,9 @@ diffout: echo ============== $$i ============= ; \ base=`echo $$i | sed 's/^_//'` ; \ if [ -r $${base}.ok ]; then \ - diff -c $${base}.ok $$i ; \ + diff -u $${base}.ok $$i ; \ else \ - diff -c "$(srcdir)"/$${base}.ok $$i ; \ + diff -u "$(srcdir)"/$${base}.ok $$i ; \ fi ; \ fi ; \ done | more |