From 3eea97909be233744597829bc22af1115724585d Mon Sep 17 00:00:00 2001 From: Rolf Eike Beer Date: Fri, 3 Jan 2020 00:03:28 +0100 Subject: [PATCH 1/2] eclass: do not pass "-nomake tests" to configure when we want Qt tests Signed-off-by: Rolf Eike Beer --- eclass/qt5-build.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 95eb61743..c5bf282be 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -582,7 +582,7 @@ qt5_base_configure() { # exclude examples and tests from default build -nomake examples - -nomake tests + $(usex test '' '-nomake tests') -no-compile-examples # disable rpath on non-prefix (bugs 380415 and 417169) From 2196cbdb87b24392810ba9eda78e42541fdb1908 Mon Sep 17 00:00:00 2001 From: Rolf Eike Beer Date: Sat, 4 Jan 2020 16:25:18 +0100 Subject: [PATCH 2/2] eclass: simplify workaround for bug 474004 during Qt builds Signed-off-by: Rolf Eike Beer --- eclass/qt5-build.eclass | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index c5bf282be..e40368a15 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -208,9 +208,6 @@ qt5-build_src_compile() { # @DESCRIPTION: # Runs tests in the target directories. qt5-build_src_test() { - # disable broken cmake tests (bug 474004) - local myqmakeargs=("${myqmakeargs[@]}" -after SUBDIRS-=cmake SUBDIRS-=installed_cmake) - qt5_foreach_target_subdir qt5_qmake qt5_foreach_target_subdir emake @@ -650,6 +647,11 @@ qt5_base_configure() { "${myconf[@]}" ) + if [[ -f "${S}"/tests/auto/auto.pro ]] && use test; then + # disable broken cmake tests (bug 474004) + echo 'SUBDIRS-=cmake installed_cmake' >> "${S}"/tests/auto/auto.pro || die + fi + pushd "${QT5_BUILD_DIR}" >/dev/null || die einfo "Configuring with: ${conf[@]}"