mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

Relax pngtest-all message testing

Browse Source 
Previously the 'make check' test pngtest-all looked for given messages
at EOL.  The match failed with Windows/MSYS2 because of the Windows
<cr><lf> line endings output by pngtest.  This changes the test to look
for the message anywhere in a line; this might give false matches but
the specific messages being searched for are not likely to cause this
problem.

Signed-off-by: John Bowler <jbowler@acm.org>
This commit is contained in:
John Bowler 2024-01-19 15:31:53 -08:00
parent 144b348e07
commit 8fb49b8b94
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/pngtest-all
View File

@ -41,11 +41,17 @@ check_stdout(){
# $1: the test file (a bad PNG which must produce a warning, etc) # $1: the test file (a bad PNG which must produce a warning, etc)
# $2: a string which must occur at the end of line on stdout for success # $2: a string which must occur at the end of line on stdout for success
# result: an error message on descriptor 3 if the string is NOT found # result: an error message on descriptor 3 if the string is NOT found
#
# WARNING: when this script is executed on MSYS2 (Windows Cygwin variant)
# pngtest outputs lines terminated with <cr><lf> however the MSYS2 shell
# expects <lf> (\n) terminated lines so the <cr> ends up in the shell
# variable 'line' below. The pattern matching ignores this because of the
# '*' at the end of the pattern match.
found= found=
while read line while read line
do do
case "$line" in case "$line" in
*"$2") found=1;; *"$2"*) found=1;;
esac esac
echo "$line" # preserve the original output verbatim echo "$line" # preserve the original output verbatim
done done