From ed9d09cf0a5453e4e368b7f6a95d172a3fa3e46d Mon Sep 17 00:00:00 2001 From: Thomas Bernard Date: Thu, 5 Mar 2020 23:15:06 +0100 Subject: [PATCH] make tests pass under FreeBSD. the -I option for the GNU diff and the FreeBSD diff behaves differently regarding escaping the ( ) and | By using two -I option, we avoid using such charracters. --- test/tiff2ps-EPS1.sh | 2 +- test/tiff2ps-PS1.sh | 3 ++- test/tiff2ps-PS2.sh | 2 +- test/tiff2ps-PS3.sh | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/test/tiff2ps-EPS1.sh b/test/tiff2ps-EPS1.sh index b1dc82e7..150039ef 100755 --- a/test/tiff2ps-EPS1.sh +++ b/test/tiff2ps-EPS1.sh @@ -5,4 +5,4 @@ PSFILE=o-tiff2ps-EPS1.ps . ${srcdir:-.}/common.sh f_test_stdout "${TIFF2PS} -e -1" "${IMG_MINISWHITE_1C_1B}" "${PSFILE}" -diff -I '%%\(CreationDate\|Title\):*' -u "${REFS}/${PSFILE}" "${PSFILE}" || exit 1 +diff -I '%%CreationDate:.*' -I '%%Title:.*' -u "${REFS}/${PSFILE}" "${PSFILE}" || exit 1 diff --git a/test/tiff2ps-PS1.sh b/test/tiff2ps-PS1.sh index 73171b98..ef08b13b 100755 --- a/test/tiff2ps-PS1.sh +++ b/test/tiff2ps-PS1.sh @@ -5,4 +5,5 @@ PSFILE="o-tiff2ps-PS1.ps" . ${srcdir:-.}/common.sh f_test_stdout "${TIFF2PS} -a -p -1" "${IMG_MINISWHITE_1C_1B}" "${PSFILE}" -diff -I '%%\(CreationDate\|Title\):*' -u "${REFS}/${PSFILE}" "${PSFILE}" || exit 1 +#diff -I '%%(CreationDate|Title):.*' -u "${REFS}/${PSFILE}" "${PSFILE}" || exit 1 +diff -I '%%CreationDate:.*' -I '%%Title:.*' -u "${REFS}/${PSFILE}" "${PSFILE}" || exit 1 diff --git a/test/tiff2ps-PS2.sh b/test/tiff2ps-PS2.sh index 9d3a521d..b130b08c 100755 --- a/test/tiff2ps-PS2.sh +++ b/test/tiff2ps-PS2.sh @@ -5,4 +5,4 @@ PSFILE=o-tiff2ps-PS2.ps . ${srcdir:-.}/common.sh f_test_stdout "${TIFF2PS} -a -p -2" "${IMG_MINISWHITE_1C_1B}" "${PSFILE}" -diff -I '%%\(CreationDate\|Title\):*' -u "${REFS}/${PSFILE}" "${PSFILE}" || exit 1 +diff -I '%%CreationDate:.*' -I '%%Title:.*' -u "${REFS}/${PSFILE}" "${PSFILE}" || exit 1 diff --git a/test/tiff2ps-PS3.sh b/test/tiff2ps-PS3.sh index eb55b9a0..d22be09a 100755 --- a/test/tiff2ps-PS3.sh +++ b/test/tiff2ps-PS3.sh @@ -5,4 +5,4 @@ PSFILE=o-tiff2ps-PS3.ps . ${srcdir:-.}/common.sh f_test_stdout "${TIFF2PS} -a -p -3" "${IMG_MINISWHITE_1C_1B}" "${PSFILE}" -diff -I '%%\(CreationDate\|Title\):*' -u "${REFS}/${PSFILE}" "${PSFILE}" || exit 1 +diff -I '%%CreationDate:.*' -I '%%Title:.*' -u "${REFS}/${PSFILE}" "${PSFILE}" || exit 1