Merge branch 'freebsd-tests' into 'master'

make tests pass under FreeBSD.

See merge request libtiff/libtiff!113
This commit is contained in:
Even Rouault 2020-03-05 22:26:11 +00:00
commit a712dc3f42
4 changed files with 5 additions and 4 deletions

View File

@ -5,4 +5,4 @@
PSFILE=o-tiff2ps-EPS1.ps PSFILE=o-tiff2ps-EPS1.ps
. ${srcdir:-.}/common.sh . ${srcdir:-.}/common.sh
f_test_stdout "${TIFF2PS} -e -1" "${IMG_MINISWHITE_1C_1B}" "${PSFILE}" 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

View File

@ -5,4 +5,5 @@
PSFILE="o-tiff2ps-PS1.ps" PSFILE="o-tiff2ps-PS1.ps"
. ${srcdir:-.}/common.sh . ${srcdir:-.}/common.sh
f_test_stdout "${TIFF2PS} -a -p -1" "${IMG_MINISWHITE_1C_1B}" "${PSFILE}" 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

View File

@ -5,4 +5,4 @@
PSFILE=o-tiff2ps-PS2.ps PSFILE=o-tiff2ps-PS2.ps
. ${srcdir:-.}/common.sh . ${srcdir:-.}/common.sh
f_test_stdout "${TIFF2PS} -a -p -2" "${IMG_MINISWHITE_1C_1B}" "${PSFILE}" 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

View File

@ -5,4 +5,4 @@
PSFILE=o-tiff2ps-PS3.ps PSFILE=o-tiff2ps-PS3.ps
. ${srcdir:-.}/common.sh . ${srcdir:-.}/common.sh
f_test_stdout "${TIFF2PS} -a -p -3" "${IMG_MINISWHITE_1C_1B}" "${PSFILE}" 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