commit: 6e5b0fc2e48d639cda21b7f313085ed3024f2cf3 Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru> AuthorDate: Sun Sep 5 10:43:39 2021 +0000 Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me> CommitDate: Sun Sep 5 10:43:39 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6e5b0fc2
sci-physics/SU2: replace 'python' with '${EPYTHON}'. Add 'die' commands Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru> sci-physics/SU2/SU2-7.1.1.ebuild | 29 +++++++++++++++++------------ sci-physics/SU2/SU2-7.2.0.ebuild | 29 +++++++++++++++++------------ 2 files changed, 34 insertions(+), 24 deletions(-) diff --git a/sci-physics/SU2/SU2-7.1.1.ebuild b/sci-physics/SU2/SU2-7.1.1.ebuild index 4817101c3..87b3d2328 100644 --- a/sci-physics/SU2/SU2-7.1.1.ebuild +++ b/sci-physics/SU2/SU2-7.1.1.ebuild @@ -95,11 +95,11 @@ src_configure() { } src_test() { - ln -s ../../${P}-build/SU2_CFD/src/SU2_CFD SU2_PY/SU2_CFD - ln -s ../../${P}-build/SU2_DEF/src/SU2_DEF SU2_PY/SU2_DEF - ln -s ../../${P}-build/SU2_DOT/src/SU2_DOT SU2_PY/SU2_DOT - ln -s ../../${P}-build/SU2_GEO/src/SU2_GEO SU2_PY/SU2_GEO - ln -s ../../${P}-build/SU2_SOL/src/SU2_SOL SU2_PY/SU2_SOL + ln -s ../../${P}-build/SU2_CFD/src/SU2_CFD SU2_PY/SU2_CFD || die + ln -s ../../${P}-build/SU2_DEF/src/SU2_DEF SU2_PY/SU2_DEF || die + ln -s ../../${P}-build/SU2_DOT/src/SU2_DOT SU2_PY/SU2_DOT || die + ln -s ../../${P}-build/SU2_GEO/src/SU2_GEO SU2_PY/SU2_GEO || die + ln -s ../../${P}-build/SU2_SOL/src/SU2_SOL SU2_PY/SU2_SOL || die export SU2_RUN="${S}/SU2_PY" export SU2_HOME="${S}" @@ -107,13 +107,18 @@ src_test() { export PYTHONPATH=$PYTHONPATH:$SU2_RUN einfo "Running UnitTests ..." - ../${P}-build/UnitTests/test_driver - - pushd TestCases/ - use mpi && python parallel_regression.py - use mpi || python serial_regression.py - use tutorials && use mpi && python tutorials.py - popd + ../${P}-build/UnitTests/test_driver || die + + pushd TestCases/ || die + if use mpi ; then + ${EPYTHON} parallel_regression.py || die + if use tutorials ; then + ${EPYTHON} tutorials.py || die + fi + else + ${EPYTHON} serial_regression.py || die + fi + popd || die } src_install() { diff --git a/sci-physics/SU2/SU2-7.2.0.ebuild b/sci-physics/SU2/SU2-7.2.0.ebuild index 84dfe6e00..e211c5388 100644 --- a/sci-physics/SU2/SU2-7.2.0.ebuild +++ b/sci-physics/SU2/SU2-7.2.0.ebuild @@ -97,11 +97,11 @@ src_configure() { } src_test() { - ln -s ../../${P}-build/SU2_CFD/src/SU2_CFD SU2_PY/SU2_CFD - ln -s ../../${P}-build/SU2_DEF/src/SU2_DEF SU2_PY/SU2_DEF - ln -s ../../${P}-build/SU2_DOT/src/SU2_DOT SU2_PY/SU2_DOT - ln -s ../../${P}-build/SU2_GEO/src/SU2_GEO SU2_PY/SU2_GEO - ln -s ../../${P}-build/SU2_SOL/src/SU2_SOL SU2_PY/SU2_SOL + ln -s ../../${P}-build/SU2_CFD/src/SU2_CFD SU2_PY/SU2_CFD || die + ln -s ../../${P}-build/SU2_DEF/src/SU2_DEF SU2_PY/SU2_DEF || die + ln -s ../../${P}-build/SU2_DOT/src/SU2_DOT SU2_PY/SU2_DOT || die + ln -s ../../${P}-build/SU2_GEO/src/SU2_GEO SU2_PY/SU2_GEO || die + ln -s ../../${P}-build/SU2_SOL/src/SU2_SOL SU2_PY/SU2_SOL || die export SU2_RUN="${S}/SU2_PY" export SU2_HOME="${S}" @@ -109,13 +109,18 @@ src_test() { export PYTHONPATH=$PYTHONPATH:$SU2_RUN einfo "Running UnitTests ..." - ../${P}-build/UnitTests/test_driver - - pushd TestCases/ - use mpi && python parallel_regression.py - use mpi || python serial_regression.py - use tutorials && use mpi && python tutorials.py - popd + ../${P}-build/UnitTests/test_driver || die + + pushd TestCases/ || die + if use mpi ; then + ${EPYTHON} parallel_regression.py || die + if use tutorials ; then + ${EPYTHON} tutorials.py || die + fi + else + ${EPYTHON} serial_regression.py || die + fi + popd || die } src_install() {