qt5-build.eclass: replace deprecated virtualmake usage with virtx
authorDavide Pesavento <pesa@gentoo.org>
Sat, 26 Dec 2015 21:51:32 +0000 (22:51 +0100)
committerDavide Pesavento <pesa@gentoo.org>
Tue, 2 Feb 2016 18:34:51 +0000 (19:34 +0100)
(cherry picked from proj/qt commit b545feebf73592d8068d7ac71264a786328e3e73)

eclass/qt5-build.eclass

index 6534f8106d2b5865c00b57c98e2189979e7c3431..8120c9f7416178f0180d1b31821e282a69be5111 100644 (file)
@@ -246,14 +246,13 @@ qt5-build_src_test() {
        _EOF_
        chmod +x "${testrunner}"
 
-       _qt5_test_runner() {
+       local testcmd=(
                qt5_foreach_target_subdir emake TESTRUNNER="'${testrunner}'" check
-       }
-
+       )
        if [[ ${VIRTUALX_REQUIRED} == test ]]; then
-               VIRTUALX_COMMAND="_qt5_test_runner" virtualmake
+               virtx "${testcmd[@]}"
        else
-               _qt5_test_runner
+               "${testcmd[@]}"
        fi
 }