| 1 |
commit: d98dedd5ee4a9ba038e84df521237631645f3762 |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 26 21:51:32 2015 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 2 18:34:51 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d98dedd5 |
| 7 |
|
| 8 |
qt5-build.eclass: replace deprecated virtualmake usage with virtx |
| 9 |
|
| 10 |
(cherry picked from proj/qt commit b545feebf73592d8068d7ac71264a786328e3e73) |
| 11 |
|
| 12 |
eclass/qt5-build.eclass | 9 ++++----- |
| 13 |
1 file changed, 4 insertions(+), 5 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
| 16 |
index 6534f81..8120c9f 100644 |
| 17 |
--- a/eclass/qt5-build.eclass |
| 18 |
+++ b/eclass/qt5-build.eclass |
| 19 |
@@ -246,14 +246,13 @@ qt5-build_src_test() { |
| 20 |
_EOF_ |
| 21 |
chmod +x "${testrunner}" |
| 22 |
|
| 23 |
- _qt5_test_runner() { |
| 24 |
+ local testcmd=( |
| 25 |
qt5_foreach_target_subdir emake TESTRUNNER="'${testrunner}'" check |
| 26 |
- } |
| 27 |
- |
| 28 |
+ ) |
| 29 |
if [[ ${VIRTUALX_REQUIRED} == test ]]; then |
| 30 |
- VIRTUALX_COMMAND="_qt5_test_runner" virtualmake |
| 31 |
+ virtx "${testcmd[@]}" |
| 32 |
else |
| 33 |
- _qt5_test_runner |
| 34 |
+ "${testcmd[@]}" |
| 35 |
fi |
| 36 |
} |
Archives