[PATCH v4 7/8] t4124: fix test for non-compliant diff(1)
- From
Đoàn Trần Công Danh <congdanhqx@gmail.com>
- Date
- Mar 26, 2020, 04:37 UTC
- Message-ID
- <02c115e93aa27bb0a8ebfb65a69d12b4cd26fc9b.1585197360.git.congdanhqx@gmail.com>
- In-Reply-To
- <cover.1585197360.git.congdanhqx@gmail.com>
POSIX's diff(1) requires output in normal diff format. However, busybox's diff's output is written in unified format.
HP-UX's diff(1) doesn't understand "-u" as of now.
Workaround this problem by checking "diff -u" output, if we couldn't make anything from normal-diff format.
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> --- t/t4124-apply-ws-rule.sh | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/t/t4124-apply-ws-rule.sh b/t/t4124-apply-ws-rule.sh index 971a5a7512..4a1bb141d9 100755 --- a/t/t4124-apply-ws-rule.sh +++ b/t/t4124-apply-ws-rule.sh @@ -52,6 +52,12 @@ test_fix () { # find touched lines $DIFF file target | sed -n -e "s/^> //p" >fixed + # busybox's diff(1) doesn't output normal format + if ! test -s fixed; then + $DIFF -u file target | + grep -v '^+++ target' | + sed -ne "/^+/s/+//p" >fixed + fi # the changed lines are all expected to change fixed_cnt=$(wc -l <fixed)
-- 2.26.0.rc2.357.g1e1ba0441d