Skip to content

Commit

Permalink
test (autotools): skip script tests if tools aren't built
Browse files Browse the repository at this point in the history
In Gentoo, we avoid building the tools for multilib (32-bit, x86) builds on
amd64/x86_64 because we only need the library to keep binary applications working.

This causes a test failure in e.g. tiffcp-thumbnail.sh as the 'thumbnail'
binary isn't built. Skip it if unavailable.

Fixes: https://gitlab.com/libtiff/libtiff/-/issues/421
  • Loading branch information
thesamesam committed Feb 22, 2023
1 parent 61656f9 commit 223078d
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion test/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,14 @@ XFAIL_TESTS =
CLEANFILES = test_packbits.tif o-*

if HAVE_JPEG
if TIFF_TOOLS
JPEG_DEPENDENT_CHECK_PROG=raw_decode
JPEG_DEPENDENT_TESTSCRIPTS=\
tiff2rgba-quad-tile.jpg.sh \
tiff2rgba-ojpeg_zackthecat_subsamp22_single_strip.sh \
tiff2rgba-ojpeg_chewey_subsamp21_multi_strip.sh \
tiff2rgba-ojpeg_single_strip_no_rowsperstrip.sh

endif
else
JPEG_DEPENDENT_CHECK_PROG=
JPEG_DEPENDENT_TESTSCRIPTS=
Expand All @@ -80,6 +81,7 @@ check_PROGRAMS = \
endif

# Test scripts to execute
if TIFF_TOOLS
TESTSCRIPTS = \
ppm2tiff_pbm.sh \
ppm2tiff_pgm.sh \
Expand Down Expand Up @@ -161,6 +163,9 @@ TESTSCRIPTS = \
testfax3_bug_513.sh \
testdeflatelaststripextradata.sh \
$(JPEG_DEPENDENT_TESTSCRIPTS)
else
TESTSCRIPTS=
endif

# This list should contain the references files
# from the 'refs' subdirectory
Expand Down

0 comments on commit 223078d

Please sign in to comment.