| 1 |
commit: 6e5b0fc2e48d639cda21b7f313085ed3024f2cf3 |
| 2 |
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru> |
| 3 |
AuthorDate: Sun Sep 5 10:43:39 2021 +0000 |
| 4 |
Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me> |
| 5 |
CommitDate: Sun Sep 5 10:43:39 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6e5b0fc2 |
| 7 |
|
| 8 |
sci-physics/SU2: replace 'python' with '${EPYTHON}'. Add 'die' commands |
| 9 |
|
| 10 |
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru> |
| 11 |
|
| 12 |
sci-physics/SU2/SU2-7.1.1.ebuild | 29 +++++++++++++++++------------ |
| 13 |
sci-physics/SU2/SU2-7.2.0.ebuild | 29 +++++++++++++++++------------ |
| 14 |
2 files changed, 34 insertions(+), 24 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sci-physics/SU2/SU2-7.1.1.ebuild b/sci-physics/SU2/SU2-7.1.1.ebuild |
| 17 |
index 4817101c3..87b3d2328 100644 |
| 18 |
--- a/sci-physics/SU2/SU2-7.1.1.ebuild |
| 19 |
+++ b/sci-physics/SU2/SU2-7.1.1.ebuild |
| 20 |
@@ -95,11 +95,11 @@ src_configure() { |
| 21 |
} |
| 22 |
|
| 23 |
src_test() { |
| 24 |
- ln -s ../../${P}-build/SU2_CFD/src/SU2_CFD SU2_PY/SU2_CFD |
| 25 |
- ln -s ../../${P}-build/SU2_DEF/src/SU2_DEF SU2_PY/SU2_DEF |
| 26 |
- ln -s ../../${P}-build/SU2_DOT/src/SU2_DOT SU2_PY/SU2_DOT |
| 27 |
- ln -s ../../${P}-build/SU2_GEO/src/SU2_GEO SU2_PY/SU2_GEO |
| 28 |
- ln -s ../../${P}-build/SU2_SOL/src/SU2_SOL SU2_PY/SU2_SOL |
| 29 |
+ ln -s ../../${P}-build/SU2_CFD/src/SU2_CFD SU2_PY/SU2_CFD || die |
| 30 |
+ ln -s ../../${P}-build/SU2_DEF/src/SU2_DEF SU2_PY/SU2_DEF || die |
| 31 |
+ ln -s ../../${P}-build/SU2_DOT/src/SU2_DOT SU2_PY/SU2_DOT || die |
| 32 |
+ ln -s ../../${P}-build/SU2_GEO/src/SU2_GEO SU2_PY/SU2_GEO || die |
| 33 |
+ ln -s ../../${P}-build/SU2_SOL/src/SU2_SOL SU2_PY/SU2_SOL || die |
| 34 |
|
| 35 |
export SU2_RUN="${S}/SU2_PY" |
| 36 |
export SU2_HOME="${S}" |
| 37 |
@@ -107,13 +107,18 @@ src_test() { |
| 38 |
export PYTHONPATH=$PYTHONPATH:$SU2_RUN |
| 39 |
|
| 40 |
einfo "Running UnitTests ..." |
| 41 |
- ../${P}-build/UnitTests/test_driver |
| 42 |
- |
| 43 |
- pushd TestCases/ |
| 44 |
- use mpi && python parallel_regression.py |
| 45 |
- use mpi || python serial_regression.py |
| 46 |
- use tutorials && use mpi && python tutorials.py |
| 47 |
- popd |
| 48 |
+ ../${P}-build/UnitTests/test_driver || die |
| 49 |
+ |
| 50 |
+ pushd TestCases/ || die |
| 51 |
+ if use mpi ; then |
| 52 |
+ ${EPYTHON} parallel_regression.py || die |
| 53 |
+ if use tutorials ; then |
| 54 |
+ ${EPYTHON} tutorials.py || die |
| 55 |
+ fi |
| 56 |
+ else |
| 57 |
+ ${EPYTHON} serial_regression.py || die |
| 58 |
+ fi |
| 59 |
+ popd || die |
| 60 |
} |
| 61 |
|
| 62 |
src_install() { |
| 63 |
|
| 64 |
diff --git a/sci-physics/SU2/SU2-7.2.0.ebuild b/sci-physics/SU2/SU2-7.2.0.ebuild |
| 65 |
index 84dfe6e00..e211c5388 100644 |
| 66 |
--- a/sci-physics/SU2/SU2-7.2.0.ebuild |
| 67 |
+++ b/sci-physics/SU2/SU2-7.2.0.ebuild |
| 68 |
@@ -97,11 +97,11 @@ src_configure() { |
| 69 |
} |
| 70 |
|
| 71 |
src_test() { |
| 72 |
- ln -s ../../${P}-build/SU2_CFD/src/SU2_CFD SU2_PY/SU2_CFD |
| 73 |
- ln -s ../../${P}-build/SU2_DEF/src/SU2_DEF SU2_PY/SU2_DEF |
| 74 |
- ln -s ../../${P}-build/SU2_DOT/src/SU2_DOT SU2_PY/SU2_DOT |
| 75 |
- ln -s ../../${P}-build/SU2_GEO/src/SU2_GEO SU2_PY/SU2_GEO |
| 76 |
- ln -s ../../${P}-build/SU2_SOL/src/SU2_SOL SU2_PY/SU2_SOL |
| 77 |
+ ln -s ../../${P}-build/SU2_CFD/src/SU2_CFD SU2_PY/SU2_CFD || die |
| 78 |
+ ln -s ../../${P}-build/SU2_DEF/src/SU2_DEF SU2_PY/SU2_DEF || die |
| 79 |
+ ln -s ../../${P}-build/SU2_DOT/src/SU2_DOT SU2_PY/SU2_DOT || die |
| 80 |
+ ln -s ../../${P}-build/SU2_GEO/src/SU2_GEO SU2_PY/SU2_GEO || die |
| 81 |
+ ln -s ../../${P}-build/SU2_SOL/src/SU2_SOL SU2_PY/SU2_SOL || die |
| 82 |
|
| 83 |
export SU2_RUN="${S}/SU2_PY" |
| 84 |
export SU2_HOME="${S}" |
| 85 |
@@ -109,13 +109,18 @@ src_test() { |
| 86 |
export PYTHONPATH=$PYTHONPATH:$SU2_RUN |
| 87 |
|
| 88 |
einfo "Running UnitTests ..." |
| 89 |
- ../${P}-build/UnitTests/test_driver |
| 90 |
- |
| 91 |
- pushd TestCases/ |
| 92 |
- use mpi && python parallel_regression.py |
| 93 |
- use mpi || python serial_regression.py |
| 94 |
- use tutorials && use mpi && python tutorials.py |
| 95 |
- popd |
| 96 |
+ ../${P}-build/UnitTests/test_driver || die |
| 97 |
+ |
| 98 |
+ pushd TestCases/ || die |
| 99 |
+ if use mpi ; then |
| 100 |
+ ${EPYTHON} parallel_regression.py || die |
| 101 |
+ if use tutorials ; then |
| 102 |
+ ${EPYTHON} tutorials.py || die |
| 103 |
+ fi |
| 104 |
+ else |
| 105 |
+ ${EPYTHON} serial_regression.py || die |
| 106 |
+ fi |
| 107 |
+ popd || die |
| 108 |
} |
| 109 |
|
| 110 |
src_install() { |
Archives