net-misc/seafile-client: Don't require QtTest #4489
Conversation
|
Pull Request assignment Areas affected: ebuilds net-misc/seafile-client: @moschlar, @gentoo/proxy-maint |
gentoo-repo-qa-bot
added
self-maintained
| @@ -0,0 +1,49 @@ | |||
| # Copyright 1999-2017 Gentoo Foundation | |||
There was a problem hiding this comment.
Any reason not to remove -r0 while at it? I'd say this is safe enough patch to justify git mv.
| dev-qt/linguist-tools:5" | ||
|
|
||
| src_prepare() { | ||
| epatch "${FILESDIR}/${P}-only-use-qttest-when-needed.patch" |
| export QT_SELECT=qt5 | ||
| local mycmakeargs=( | ||
| -DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)" | ||
| ) |
There was a problem hiding this comment.
Any reason not to support tests?
|
@mgorny: Thanks for your review! |
|
|
||
| src_prepare() { | ||
| use test || eapply "${FILESDIR}/${P}-only-use-qttest-when-needed.patch" |
There was a problem hiding this comment.
You want to apply this unconditionally. After all, there's a conditional inside.
|
They do: Test phase
>>> Test phase: net-misc/seafile-client-6.0.4-r1
>>> Working in BUILD_DIR: "/var/tmp/portage/net-misc/seafile-client-6.0.4-r1/work/seafile-client-6.0.4_build"
ctest -j 2 --test-load 999
Test project /var/tmp/portage/net-misc/seafile-client-6.0.4-r1/work/seafile-client-6.0.4_build
Start 1: test_server-info
Start 2: test_utils
1/4 Test #2: test_utils ....................... Passed 0.10 sec
Start 3: test_file-utils
2/4 Test #1: test_server-info ................. Passed 0.11 sec
3/4 Test #3: test_file-utils .................. Passed 0.03 sec
Start 4: test_stl
4/4 Test #4: test_stl ......................... Passed 0.03 sec
100% tests passed, 0 tests failed out of 4
Total Test time (real) = 0.17 sec
* Tests succeeded.
>>> Completed testing net-misc/seafile-client-6.0.4-r1
|
|
Ah, ok. That looks good then. However… could you look at build log? With the way the code is done I'm a little scared it might be linking the whole program to Qt5Test instead of just the tests… |
|
@mgorny, you were absolutely right! |
| @@ -43,6 +45,7 @@ src_configure() { | |||
| export QT_SELECT=qt5 | |||
There was a problem hiding this comment.
@gentoo/qt, is this something we're supposed to do in ebuilds?
There was a problem hiding this comment.
uhm definitely not. You must use eqmake5 or fix the build system to detect the correct Qt version. Most cmake-based packages that support both Qt4 and Qt5 expose an option to select between the two.
There was a problem hiding this comment.
Thanks, you two!
I've added a patch that fixes the build system in #4497.
Since the project doesn't use qmake, I suppose this is the more correct way.
(Compilation only works with Qt5 - but if Qt4 is installed, there is one test for qmake version that then gives the result for Qt4...)
Closes: #615838
https://bugs.gentoo.org/show_bug.cgi?id=615838