[gentoo-commits] repo/gentoo:master commit in: sci-physics/geant-vmc/

[Michał Górny]

commit:     f0856e549448bc63c0a5cc816c72b859d20360b1
Author:     Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Tue Jul 16 23:29:58 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 15:45:47 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0856e54

sci-physics/geant-vmc: Fixes for test suite.

This works around issues either already
fixed in upstream master or in pending PRs.

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild | 7 ++++++-
 sci-physics/geant-vmc/geant-vmc-9999.ebuild  | 5 +++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild b/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild
index ae53bfcd41d..83c2f0b1204 100644
--- a/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild
+++ b/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild
@@ -31,6 +31,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 RESTRICT="
+	!examples? ( test )
 	!geant3? ( test )
 	!g4root? ( test )
 	!mtroot? ( test )
@@ -77,8 +78,12 @@ src_test() {
 	# see e.g. https://sft.its.cern.ch/jira/browse/ROOT-8146 .
 	addwrite /dev/random
 	cd examples || die
+	# Bug: Can not disable Garfield in test suite, fixed upstream.
+	sed -i 's/ExGarfield//' test_suite.sh || die
+	# Bug: Path for E03 sub-examples wrong, see https://github.com/vmc-project/geant4_vmc/pull/11 .
+	sed -i 's#only in E03 test#only in E03 test\nG4EXEDIR=${BUILDDIR}/examples/$EXAMPLE/$OPTION#' test_suite_exe.sh || die
 	./test_suite.sh --g3=off --builddir="${BUILD_DIR}" || die
-	./test_suite_exe.sh --g3=off --builddir="${BUILD_DIR}" || die
+	./test_suite_exe.sh --g3=off --garfield=off --builddir="${BUILD_DIR}" || die
 }
 
 src_install() {

diff --git a/sci-physics/geant-vmc/geant-vmc-9999.ebuild b/sci-physics/geant-vmc/geant-vmc-9999.ebuild
index ae53bfcd41d..ffc8e7dc874 100644
--- a/sci-physics/geant-vmc/geant-vmc-9999.ebuild
+++ b/sci-physics/geant-vmc/geant-vmc-9999.ebuild
@@ -31,6 +31,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 RESTRICT="
+	!examples? ( test )
 	!geant3? ( test )
 	!g4root? ( test )
 	!mtroot? ( test )
@@ -77,8 +78,8 @@ src_test() {
 	# see e.g. https://sft.its.cern.ch/jira/browse/ROOT-8146 .
 	addwrite /dev/random
 	cd examples || die
-	./test_suite.sh --g3=off --builddir="${BUILD_DIR}" || die
-	./test_suite_exe.sh --g3=off --builddir="${BUILD_DIR}" || die
+	./test_suite.sh --debug --g3=off --garfield=off --builddir="${BUILD_DIR}" || die
+	./test_suite_exe.sh -debug --g3=off --garfield=off --builddir="${BUILD_DIR}" || die
 }
 
 src_install() {