diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2018-10-31 14:40:07 +0100 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2018-10-31 14:45:00 +0100 |
| commit | 289e63e3fbf04c3c2d20b0da04701b454050d3aa (patch) | |
| tree | 34ad5624ef715bad27a110d50f5ab3e0dd7ee8eb /media-gfx | |
| parent | media-libs/libheif: amd64 & x86 stable (diff) | |
| download | gentoo-289e63e3fbf04c3c2d20b0da04701b454050d3aa.tar.gz gentoo-289e63e3fbf04c3c2d20b0da04701b454050d3aa.tar.bz2 gentoo-289e63e3fbf04c3c2d20b0da04701b454050d3aa.zip | |
media-gfx/imagemagick: use magick.sh wrapper in src_test
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/imagemagick/imagemagick-6.9.10.14.ebuild | 15 | ||||
| -rw-r--r-- | media-gfx/imagemagick/imagemagick-7.0.8.14.ebuild | 15 | ||||
| -rw-r--r-- | media-gfx/imagemagick/imagemagick-9999.ebuild | 15 |
3 files changed, 27 insertions, 18 deletions
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.14.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.14.ebuild index e20331f737f5..59b9a3439321 100644 --- a/media-gfx/imagemagick/imagemagick-6.9.10.14.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.9.10.14.ebuild @@ -172,12 +172,15 @@ src_test() { cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ die "Failed to install default blank policy.xml in '${_im_local_config_home}'" - # Check that your policy.xml file is taken into account - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ - "${S}"/utilities/.libs/identify -list policy || die - - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ - emake check + local im_command= IM_COMMANDS=() + IM_COMMANDS+=( "magick -version" ) # Verify that we are using version we just built + IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used + IM_COMMANDS+=( "emake check" ) # Run tests + + for im_command in "${IM_COMMANDS[@]}"; do + "${S}"/magick.sh \ + ${im_command} || die + done } src_install() { diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.14.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.14.ebuild index 73a88b3b9d7b..adf47c49a562 100644 --- a/media-gfx/imagemagick/imagemagick-7.0.8.14.ebuild +++ b/media-gfx/imagemagick/imagemagick-7.0.8.14.ebuild @@ -176,12 +176,15 @@ src_test() { cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ die "Failed to install default blank policy.xml in '${_im_local_config_home}'" - # Check that your policy.xml file is taken into account - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ - "${S}"/utilities/.libs/magick -list policy || die - - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ - emake check + local im_command= IM_COMMANDS=() + IM_COMMANDS+=( "magick -version" ) # Verify that we are using version we just built + IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used + IM_COMMANDS+=( "emake check" ) # Run tests + + for im_command in "${IM_COMMANDS[@]}"; do + "${S}"/magick.sh \ + ${im_command} || die + done } src_install() { diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild index 73a88b3b9d7b..adf47c49a562 100644 --- a/media-gfx/imagemagick/imagemagick-9999.ebuild +++ b/media-gfx/imagemagick/imagemagick-9999.ebuild @@ -176,12 +176,15 @@ src_test() { cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ die "Failed to install default blank policy.xml in '${_im_local_config_home}'" - # Check that your policy.xml file is taken into account - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ - "${S}"/utilities/.libs/magick -list policy || die - - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ - emake check + local im_command= IM_COMMANDS=() + IM_COMMANDS+=( "magick -version" ) # Verify that we are using version we just built + IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used + IM_COMMANDS+=( "emake check" ) # Run tests + + for im_command in "${IM_COMMANDS[@]}"; do + "${S}"/magick.sh \ + ${im_command} || die + done } src_install() { |