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

Avoid random test failures by running pngtest sequentially only

Browse Source 
It is unreliable to run pngtest in parallel, due to competing writes
to the same intermediate/output file ("pngout.png").

Customization of this output file name should be possible, but it is
currently broken.
This commit is contained in:
Cosmin Truta 2019-04-21 00:30:14 -04:00
parent 5df8e982e2
commit 72fa126446
4 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -59,8 +59,7 @@ pngcp_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
# Generally these are single line shell scripts to run a test with a particular # Generally these are single line shell scripts to run a test with a particular
# set of parameters: # set of parameters:
TESTS =\ TESTS =\
tests/pngtest\ tests/pngtest-all\
tests/pngtest-badpngs\
tests/pngvalid-gamma-16-to-8 tests/pngvalid-gamma-alpha-mode\ tests/pngvalid-gamma-16-to-8 tests/pngvalid-gamma-alpha-mode\
tests/pngvalid-gamma-background tests/pngvalid-gamma-expand16-alpha-mode\ tests/pngvalid-gamma-background tests/pngvalid-gamma-expand16-alpha-mode\
tests/pngvalid-gamma-expand16-background\ tests/pngvalid-gamma-expand16-background\

16
Makefile.in
View File

@ -736,8 +736,7 @@ pngcp_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
# Generally these are single line shell scripts to run a test with a particular # Generally these are single line shell scripts to run a test with a particular
# set of parameters: # set of parameters:
TESTS = \ TESTS = \
tests/pngtest\ tests/pngtest-all\
tests/pngtest-badpngs\
tests/pngvalid-gamma-16-to-8 tests/pngvalid-gamma-alpha-mode\ tests/pngvalid-gamma-16-to-8 tests/pngvalid-gamma-alpha-mode\
tests/pngvalid-gamma-background tests/pngvalid-gamma-expand16-alpha-mode\ tests/pngvalid-gamma-background tests/pngvalid-gamma-expand16-alpha-mode\
tests/pngvalid-gamma-expand16-background\ tests/pngvalid-gamma-expand16-background\
@ -1578,16 +1577,9 @@ recheck: all $(check_PROGRAMS)
am__force_recheck=am--force-recheck \ am__force_recheck=am--force-recheck \
TEST_LOGS="$$log_list"; \ TEST_LOGS="$$log_list"; \
exit $$? exit $$?
tests/pngtest.log: tests/pngtest tests/pngtest-all.log: tests/pngtest-all
@p='tests/pngtest'; \ @p='tests/pngtest-all'; \
b='tests/pngtest'; \ b='tests/pngtest-all'; \
$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
tests/pngtest-badpngs.log: tests/pngtest-badpngs
@p='tests/pngtest-badpngs'; \
b='tests/pngtest-badpngs'; \
$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
--log-file $$b.log --trs-file $$b.trs \ --log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \

2
tests/pngtest
View File

@ -1,2 +0,0 @@
#!/bin/sh
exec ./pngtest --strict ${srcdir}/pngtest.png

7
tests/pngtest-badpngs → tests/pngtest-all
View File

@ -1,5 +1,9 @@
#!/bin/sh #!/bin/sh
# normal execution
./pngtest --strict ${srcdir}/pngtest.png
# various crashers # various crashers
# using --relaxed because some come from fuzzers that don't maintain CRC's # using --relaxed because some come from fuzzers that don't maintain CRC's
@ -9,5 +13,4 @@
./pngtest --xfail ${srcdir}/contrib/testpngs/crashers/empty_ancillary_chunks.png ./pngtest --xfail ${srcdir}/contrib/testpngs/crashers/empty_ancillary_chunks.png
./pngtest --xfail ${srcdir}/contrib/testpngs/crashers/huge_*_chunk.png \ ./pngtest --xfail ${srcdir}/contrib/testpngs/crashers/huge_*_chunk.png \
${srcdir}/contrib/testpngs/crashers/huge_*safe_to_copy.png ${srcdir}/contrib/testpngs/crashers/huge_*safe_to_copy.png
./pngtest --xfail ${srcdir}/contrib/testpngs/crashers/huge_IDAT.png
exec ./pngtest --xfail ${srcdir}/contrib/testpngs/crashers/huge_IDAT.png