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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 25678158086 for ; Wed, 24 Nov 2021 00:14:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 62F23E08F7; Wed, 24 Nov 2021 00:14:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1CA50E08F7 for ; Wed, 24 Nov 2021 00:14:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DBDA234331B for ; Wed, 24 Nov 2021 00:14:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7C5AD1C8 for ; Wed, 24 Nov 2021 00:14:11 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1637712830.baa9f37987615c0cd8858524a6504f9f7f9b7e34.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-electronics/kicad/kicad-6.0.0_rc1.ebuild sci-electronics/kicad/kicad-9999.ebuild X-VCS-Directories: sci-electronics/kicad/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: baa9f37987615c0cd8858524a6504f9f7f9b7e34 X-VCS-Branch: master Date: Wed, 24 Nov 2021 00:14:11 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5b9c2500-e8a9-4fef-9f28-a73b1a631c30 X-Archives-Hash: fdaac6e76b860e3999f427c6e331761d commit: baa9f37987615c0cd8858524a6504f9f7f9b7e34 Author: Sam James gentoo org> AuthorDate: Wed Nov 24 00:13:29 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Nov 24 00:13:50 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baa9f379 sci-electronics/kicad: fix tests Closes: https://bugs.gentoo.org/826966 Signed-off-by: Sam James gentoo.org> sci-electronics/kicad/kicad-6.0.0_rc1.ebuild | 15 ++++++++------- sci-electronics/kicad/kicad-9999.ebuild | 15 ++++++++------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/sci-electronics/kicad/kicad-6.0.0_rc1.ebuild b/sci-electronics/kicad/kicad-6.0.0_rc1.ebuild index 20f40d536dc9..5286a402f8bc 100644 --- a/sci-electronics/kicad/kicad-6.0.0_rc1.ebuild +++ b/sci-electronics/kicad/kicad-6.0.0_rc1.ebuild @@ -128,6 +128,14 @@ src_compile() { fi } +src_test() { + # Test cannot find library in Portage's sandbox. Let's create a link so test can run. + ln -s "${BUILD_DIR}/eeschema/_eeschema.kiface" "${BUILD_DIR}/qa/eeschema/_eeschema.kiface" || die + + # LD_LIBRARY_PATH is there to help it pick up the just-built libraries + LD_LIBRARY_PATH="${BUILD_DIR}/3d-viewer/3d_cache/sg:${LD_LIBRARY_PATH}" cmake_src_test +} + src_install() { cmake_src_install use python && python_optimize @@ -138,13 +146,6 @@ src_install() { fi } -src_test() { - # Test cannot find library in Portage's sandbox. Let's create a link so test can run. - ln -s "${S}_build/eeschema/_eeschema.kiface" "${S}_build/qa/eeschema/_eeschema.kiface" || die - - default -} - pkg_postinst() { optfeature "Component symbols library" sci-electronics/kicad-symbols optfeature "Component footprints library" sci-electronics/kicad-footprints diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild index 20f40d536dc9..5286a402f8bc 100644 --- a/sci-electronics/kicad/kicad-9999.ebuild +++ b/sci-electronics/kicad/kicad-9999.ebuild @@ -128,6 +128,14 @@ src_compile() { fi } +src_test() { + # Test cannot find library in Portage's sandbox. Let's create a link so test can run. + ln -s "${BUILD_DIR}/eeschema/_eeschema.kiface" "${BUILD_DIR}/qa/eeschema/_eeschema.kiface" || die + + # LD_LIBRARY_PATH is there to help it pick up the just-built libraries + LD_LIBRARY_PATH="${BUILD_DIR}/3d-viewer/3d_cache/sg:${LD_LIBRARY_PATH}" cmake_src_test +} + src_install() { cmake_src_install use python && python_optimize @@ -138,13 +146,6 @@ src_install() { fi } -src_test() { - # Test cannot find library in Portage's sandbox. Let's create a link so test can run. - ln -s "${S}_build/eeschema/_eeschema.kiface" "${S}_build/qa/eeschema/_eeschema.kiface" || die - - default -} - pkg_postinst() { optfeature "Component symbols library" sci-electronics/kicad-symbols optfeature "Component footprints library" sci-electronics/kicad-footprints