| 1 |
commit: 289e63e3fbf04c3c2d20b0da04701b454050d3aa |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 31 13:40:07 2018 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 31 13:45:00 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=289e63e3 |
| 7 |
|
| 8 |
media-gfx/imagemagick: use magick.sh wrapper in src_test |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 12 |
|
| 13 |
media-gfx/imagemagick/imagemagick-6.9.10.14.ebuild | 15 +++++++++------ |
| 14 |
media-gfx/imagemagick/imagemagick-7.0.8.14.ebuild | 15 +++++++++------ |
| 15 |
media-gfx/imagemagick/imagemagick-9999.ebuild | 15 +++++++++------ |
| 16 |
3 files changed, 27 insertions(+), 18 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.14.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.14.ebuild |
| 19 |
index e20331f737f..59b9a343932 100644 |
| 20 |
--- a/media-gfx/imagemagick/imagemagick-6.9.10.14.ebuild |
| 21 |
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.14.ebuild |
| 22 |
@@ -172,12 +172,15 @@ src_test() { |
| 23 |
cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ |
| 24 |
die "Failed to install default blank policy.xml in '${_im_local_config_home}'" |
| 25 |
|
| 26 |
- # Check that your policy.xml file is taken into account |
| 27 |
- LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ |
| 28 |
- "${S}"/utilities/.libs/identify -list policy || die |
| 29 |
- |
| 30 |
- LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ |
| 31 |
- emake check |
| 32 |
+ local im_command= IM_COMMANDS=() |
| 33 |
+ IM_COMMANDS+=( "magick -version" ) # Verify that we are using version we just built |
| 34 |
+ IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used |
| 35 |
+ IM_COMMANDS+=( "emake check" ) # Run tests |
| 36 |
+ |
| 37 |
+ for im_command in "${IM_COMMANDS[@]}"; do |
| 38 |
+ "${S}"/magick.sh \ |
| 39 |
+ ${im_command} || die |
| 40 |
+ done |
| 41 |
} |
| 42 |
|
| 43 |
src_install() { |
| 44 |
|
| 45 |
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.14.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.14.ebuild |
| 46 |
index 73a88b3b9d7..adf47c49a56 100644 |
| 47 |
--- a/media-gfx/imagemagick/imagemagick-7.0.8.14.ebuild |
| 48 |
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.14.ebuild |
| 49 |
@@ -176,12 +176,15 @@ src_test() { |
| 50 |
cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ |
| 51 |
die "Failed to install default blank policy.xml in '${_im_local_config_home}'" |
| 52 |
|
| 53 |
- # Check that your policy.xml file is taken into account |
| 54 |
- LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ |
| 55 |
- "${S}"/utilities/.libs/magick -list policy || die |
| 56 |
- |
| 57 |
- LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ |
| 58 |
- emake check |
| 59 |
+ local im_command= IM_COMMANDS=() |
| 60 |
+ IM_COMMANDS+=( "magick -version" ) # Verify that we are using version we just built |
| 61 |
+ IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used |
| 62 |
+ IM_COMMANDS+=( "emake check" ) # Run tests |
| 63 |
+ |
| 64 |
+ for im_command in "${IM_COMMANDS[@]}"; do |
| 65 |
+ "${S}"/magick.sh \ |
| 66 |
+ ${im_command} || die |
| 67 |
+ done |
| 68 |
} |
| 69 |
|
| 70 |
src_install() { |
| 71 |
|
| 72 |
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild |
| 73 |
index 73a88b3b9d7..adf47c49a56 100644 |
| 74 |
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild |
| 75 |
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild |
| 76 |
@@ -176,12 +176,15 @@ src_test() { |
| 77 |
cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ |
| 78 |
die "Failed to install default blank policy.xml in '${_im_local_config_home}'" |
| 79 |
|
| 80 |
- # Check that your policy.xml file is taken into account |
| 81 |
- LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ |
| 82 |
- "${S}"/utilities/.libs/magick -list policy || die |
| 83 |
- |
| 84 |
- LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ |
| 85 |
- emake check |
| 86 |
+ local im_command= IM_COMMANDS=() |
| 87 |
+ IM_COMMANDS+=( "magick -version" ) # Verify that we are using version we just built |
| 88 |
+ IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used |
| 89 |
+ IM_COMMANDS+=( "emake check" ) # Run tests |
| 90 |
+ |
| 91 |
+ for im_command in "${IM_COMMANDS[@]}"; do |
| 92 |
+ "${S}"/magick.sh \ |
| 93 |
+ ${im_command} || die |
| 94 |
+ done |
| 95 |
} |
| 96 |
|
| 97 |
src_install() { |
Archives