From 354be6fb3326ddc49fe0d040515ae4c41e0b7d09 Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Wed, 20 Aug 2014 20:05:55 -0400 Subject: tests/parse_control.common.sh: Use test_diff() --- (limited to 'tests') diff --git a/tests/parse_control.common.sh b/tests/parse_control.common.sh index 2ff9a6e..9097dd1 100644 --- a/tests/parse_control.common.sh +++ b/tests/parse_control.common.sh @@ -48,46 +48,4 @@ parse_control - field para "${req_fields}" <<-EOF printf 'Required fields: %s\n\n' "${req_fields}" -printf 'Diff:\n' -exec 3<<-EOF - ${results} - EOF -exec 4<<-EOF - ${test_results} - EOF -line_no=0 -while :; do - line_no=$(($line_no + 1)) - errors=0 - read -r good_line <&3 || errors=$(($errors + 1)) - read -r test_line <&4 || errors=$(($errors + 1)) - [ ${errors} -eq 2 ] && break - if [ "x${good_line}" = "x${test_line}" ]; then - printf '%3d %s\n' ${line_no} "${good_line}" - else - printf '%3d %s-%s%s\n' ${line_no} "${red}" "${good_line}" \ - "${std}" - printf '%3d %s+%s%s\n' ${line_no} "${grn}" "${test_line}" \ - "${std}" - tests_es=1 - fi -done -exec 3<&- -exec 4<&- - -printf '\nExpected results:\n' -line_no=0 -while read -r line; do - line_no=$(($line_no + 1)) - printf '%3d %s\n' ${line_no} "${line}" -done <<-EOF - ${results} - EOF -printf '\nTest results:\n' -line_no=0 -while read -r line; do - line_no=$(($line_no + 1)) - printf '%3d %s\n' ${line_no} "${line}" -done <<-EOF - ${test_results} - EOF +test_diff "${results}" "${test_results}" -- cgit v0.9.1