diff options
| author | Sam James <sam@gentoo.org> | 2022-05-21 01:01:35 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-02-22 22:58:39 +0000 |
| commit | 223078d72232c1e71e2fddb140d232c457667d19 (patch) | |
| tree | 811bd36b016249afcd2d0b25d30234530d6e7746 | |
| parent | 61656f921830513b7fffc1a991ba2c94d3202c4f (diff) | |
| download | libtiff-git-223078d72232c1e71e2fddb140d232c457667d19.tar.gz | |
test (autotools): skip script tests if tools aren't built
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
| -rw-r--r-- | test/Makefile.am | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 148406ab..0a7f9ad5 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -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= @@ -80,6 +81,7 @@ check_PROGRAMS = \ endif # Test scripts to execute +if TIFF_TOOLS TESTSCRIPTS = \ ppm2tiff_pbm.sh \ ppm2tiff_pgm.sh \ @@ -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 |