Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

eclass: do not pass "-nomake tests" to configure when we want Qt tests #204

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

eclass: do not pass "-nomake tests" to configure when we want Qt tests #204

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3eea979
eclass: do not pass "-nomake tests" to configure when we want Qt tests
DerDakon Jan 2, 2020
2196cbd
eclass: simplify workaround for bug 474004 during Qt builds
DerDakon Jan 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions eclass/qt5-build.eclass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -582,7 +579,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)
Expand Down Expand Up @@ -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[@]}"
Expand Down