From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E7E09138336 for ; Wed, 31 Oct 2018 13:45:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D8FF0E093A; Wed, 31 Oct 2018 13:45:13 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 98322E0937 for ; Wed, 31 Oct 2018 13:45:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CFDDE335C38 for ; Wed, 31 Oct 2018 13:45:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 41C21452 for ; Wed, 31 Oct 2018 13:45:10 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1540993500.289e63e3fbf04c3c2d20b0da04701b454050d3aa.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/imagemagick/imagemagick-6.9.10.14.ebuild media-gfx/imagemagick/imagemagick-7.0.8.14.ebuild media-gfx/imagemagick/imagemagick-9999.ebuild X-VCS-Directories: media-gfx/imagemagick/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 289e63e3fbf04c3c2d20b0da04701b454050d3aa X-VCS-Branch: master Date: Wed, 31 Oct 2018 13:45:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 20962c18-a037-442b-bcc2-7272589bf66d X-Archives-Hash: f4f8f43cdb70babca0d100918d8c9ce7 commit: 289e63e3fbf04c3c2d20b0da04701b454050d3aa Author: Thomas Deutschmann gentoo org> AuthorDate: Wed Oct 31 13:40:07 2018 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Wed Oct 31 13:45:00 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=289e63e3 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 gentoo.org> media-gfx/imagemagick/imagemagick-6.9.10.14.ebuild | 15 +++++++++------ media-gfx/imagemagick/imagemagick-7.0.8.14.ebuild | 15 +++++++++------ 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 e20331f737f..59b9a343932 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 73a88b3b9d7..adf47c49a56 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 73a88b3b9d7..adf47c49a56 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() {