From 3959a4253e6219b1c57e9f081d17b626529b793b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 7 Jun 2021 17:27:14 +0200 Subject: [PATCH 1/5] common/environment/check: enable offscreen test for qt --- common/environment/check/no_display.sh | 1 + 1 file changed, 1 insertion(+) create mode 100644 common/environment/check/no_display.sh diff --git a/common/environment/check/no_display.sh b/common/environment/check/no_display.sh new file mode 100644 index 000000000000..b7a905ff312c --- /dev/null +++ b/common/environment/check/no_display.sh @@ -0,0 +1 @@ +export QT_QPA_PLATFORM=${QT_QPA_PLATFORM:-offscreen} From 0780b3a660b4f7cc945539a970ceab54034a8642 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Tue, 8 Jun 2021 20:52:02 +0200 Subject: [PATCH 2/5] srcpkgs: remove QT_QPA_PLATFORM trom templates it is global now --- srcpkgs/akonadi5/template | 2 +- srcpkgs/bibletime/template | 1 - srcpkgs/dotherside/template | 2 +- srcpkgs/kColorPicker/template | 4 ---- srcpkgs/kImageAnnotator/template | 4 ---- srcpkgs/kblocks/template | 4 ---- srcpkgs/kcompletion/template | 4 ---- srcpkgs/kcontacts/template | 4 ---- srcpkgs/kdav/template | 4 ---- srcpkgs/kdenlive/template | 4 ---- srcpkgs/keditbookmarks/template | 4 ---- srcpkgs/kguiaddons/template | 4 ---- srcpkgs/khtml/template | 4 ---- srcpkgs/kleopatra/template | 2 +- srcpkgs/konqueror/template | 4 ---- srcpkgs/kparts/template | 4 ---- srcpkgs/kpat/template | 4 ---- srcpkgs/kquickcharts/template | 1 - srcpkgs/ksystemlog/template | 4 ---- srcpkgs/ktorrent/template | 4 ---- srcpkgs/libkcddb/template | 4 ---- srcpkgs/libkdegames/template | 4 ---- srcpkgs/libksysguard/template | 4 ---- srcpkgs/libktorrent/template | 4 ---- srcpkgs/okteta/template | 4 ---- srcpkgs/okular/template | 2 +- srcpkgs/purpose/template | 1 - srcpkgs/pyside2-tools/template | 4 ---- srcpkgs/python3-jupyter_qtconsole/template | 2 +- srcpkgs/python3-pytest-qt/template | 4 ++-- srcpkgs/rosegarden/template | 1 - srcpkgs/sonnet/template | 4 ---- srcpkgs/vlc/template | 4 ---- 33 files changed, 7 insertions(+), 103 deletions(-) diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template index b2f838b0e946..f02ce8d01f9a 100644 --- a/srcpkgs/akonadi5/template +++ b/srcpkgs/akonadi5/template @@ -37,7 +37,7 @@ pre_configure() { do_check() { # failing tests are disabled - sqlite tests hang on futex cd build - QT_QPA_PLATFORM=offscreen CTEST_OUTPUT_ON_FAILURE=TRUE \ + CTEST_OUTPUT_ON_FAILURE=TRUE \ dbus-run-session ctest -E \ "(akonadixml-xmldocument|mimetypechecker|AkonadiControl-agenttype|.*sqlite.*)test" } diff --git a/srcpkgs/bibletime/template b/srcpkgs/bibletime/template index 85bcc7f22f87..bc005197cdb3 100644 --- a/srcpkgs/bibletime/template +++ b/srcpkgs/bibletime/template @@ -28,7 +28,6 @@ pre_build() { } pre_check() { - export QT_QPA_PLATFORM=offscreen mkdir -p "share/bibletime" cd "share/bibletime" mkdir -p icons javascript license pics locale docs/handbook/en docs/howto/en display-templates diff --git a/srcpkgs/dotherside/template b/srcpkgs/dotherside/template index 970e7a251eb8..be0d6a98443a 100644 --- a/srcpkgs/dotherside/template +++ b/srcpkgs/dotherside/template @@ -13,7 +13,7 @@ distfiles="https://github.com/filcuc/dotherside/archive/v${version}.tar.gz" checksum=de318ef55762d4db4ae7aa272d4bb1dbd4864efd53b87b45abad149b4d13b1e7 do_check() { - QT_QPA_PLATFORM=offscreen ./build/test/TestDynamicQObject + ./build/test/TestDynamicQObject } dotherside-devel_package() { diff --git a/srcpkgs/kColorPicker/template b/srcpkgs/kColorPicker/template index 337263c2a3d9..2bbd95b6c129 100644 --- a/srcpkgs/kColorPicker/template +++ b/srcpkgs/kColorPicker/template @@ -13,10 +13,6 @@ homepage="https://github.com/DamirPorobic/kColorPicker" distfiles="https://github.com/DamirPorobic/kColorPicker/archive/v${version}.tar.gz" checksum=fe6f6c540f3921cc7097f1e5cf001883f814a9c2678c85b7f78fb7a2ba2a8c34 -pre_check() { - export QT_QPA_PLATFORM=offscreen -} - kColorPicker-devel_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" diff --git a/srcpkgs/kImageAnnotator/template b/srcpkgs/kImageAnnotator/template index 95ef67413858..f34198f8c51c 100644 --- a/srcpkgs/kImageAnnotator/template +++ b/srcpkgs/kImageAnnotator/template @@ -14,10 +14,6 @@ homepage="https://github.com/DamirPorobic/kImageAnnotator" distfiles="https://github.com/DamirPorobic/kImageAnnotator/archive/v${version}.tar.gz" checksum=9e8945d8b5871a1020be643088d15cd76496ad707a1f464af8dd91958b430856 -pre_check() { - export QT_QPA_PLATFORM=offscreen -} - kImageAnnotator-devel_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" diff --git a/srcpkgs/kblocks/template b/srcpkgs/kblocks/template index 17b5abfd6b05..0d851aad7b29 100644 --- a/srcpkgs/kblocks/template +++ b/srcpkgs/kblocks/template @@ -14,7 +14,3 @@ license="GPL-2.0-or-later" homepage="https://kde.org/applications/games/org.kde.kblocks" distfiles="${KDE_SITE}/release-service/${version}/src/kblocks-${version}.tar.xz" checksum=f678d652875cdad8612fc572ad86970a716e7701c9d246fdf6a621fda3232206 - -pre_check() { - export QT_QPA_PLATFORM=offscreen -} diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template index 97ebe0330e78..ed3ef2ce9dfa 100644 --- a/srcpkgs/kcompletion/template +++ b/srcpkgs/kcompletion/template @@ -16,10 +16,6 @@ if [ "CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel" fi -pre_check() { - export QT_QPA_PLATFORM=offscreen -} - kcompletion-devel_package() { short_desc+=" - development" depends="${makedepends} ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template index c86130cf66e2..7a8687918470 100644 --- a/srcpkgs/kcontacts/template +++ b/srcpkgs/kcontacts/template @@ -14,10 +14,6 @@ homepage="https://invent.kde.org/frameworks/kcontacts" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" checksum=e5de6baadb572db7fd5f7e5a5e7faf3ce382da035a7731bd20d6828200e98c9a -pre_check() { - export QT_QPA_PLATFORM=offscreen -} - kcontacts-devel_package() { short_desc+=" - development" depends="${makedepends} ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template index 27b4b7dec190..bcc0d32290d9 100644 --- a/srcpkgs/kdav/template +++ b/srcpkgs/kdav/template @@ -14,10 +14,6 @@ homepage="https://invent.kde.org/frameworks/kdav" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" checksum=083519f32ebe1a2120da905c12492568a80dfbfedccecbd6c523c52b4c19adcc -pre_check() { - export QT_QPA_PLATFORM=offscreen -} - kdav-devel_package() { depends="${sourcepkg}>=${version}_${revision} ${makedepends}" short_desc+=" - development files" diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template index a59a101dd921..6914d3318b38 100644 --- a/srcpkgs/kdenlive/template +++ b/srcpkgs/kdenlive/template @@ -24,7 +24,3 @@ make_check=extended # needed for mlt to work on musl CXXFLAGS="-DHAVE_LOCALE_H=1" - -pre_check() { - export QT_QPA_PLATFORM=offscreen -} diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template index a3d49fa00afe..de17f0466446 100644 --- a/srcpkgs/keditbookmarks/template +++ b/srcpkgs/keditbookmarks/template @@ -12,7 +12,3 @@ license="GPL-2.0-or-later, GFDL-1.2-only" homepage="https://www.kde.org/" distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz" checksum=b979d798f13b08b1bd022334f84f0abb374a477c601466f19b400afa0c4bb0e1 - -pre_check() { - export QT_QPA_PLATFORM=offscreen -} diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template index 9f9448539fe0..d0bbbd7db242 100644 --- a/srcpkgs/kguiaddons/template +++ b/srcpkgs/kguiaddons/template @@ -15,10 +15,6 @@ homepage="https://invent.kde.org/frameworks/kguiaddons" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" checksum=9bb7611bf10250de952e59f2ef682eec28695c7782a7b81970003f3982d5e339 -pre_check() { - export QT_QPA_PLATFORM=offscreen -} - kguiaddons-devel_package() { short_desc+=" - development" depends="${makedepends} ${sourcepkg}-${version}_${revision}" diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template index bdbb30954915..af46a18a9a58 100644 --- a/srcpkgs/khtml/template +++ b/srcpkgs/khtml/template @@ -14,10 +14,6 @@ homepage="https://invent.kde.org/frameworks/khtml" distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" checksum=0d731761778a9908883353e3b9d9d89dda573c3aca4a9ad447277a280215af2d -pre_check() { - export QT_QPA_PLATFORM=offscreen -} - khtml-devel_package() { short_desc+=" - development" depends="${makedepends} ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template index 33a3b08d89cf..1a23001c8a5e 100644 --- a/srcpkgs/kleopatra/template +++ b/srcpkgs/kleopatra/template @@ -15,7 +15,7 @@ distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar. checksum=c03bc7147e35d2994a0a7d323108d6b34e2e2c70768a5481bec3b04da7b6a870 do_check() { - QT_QPA_PLATFORM=offscreen CTEST_OUTPUT_ON_FAILURE=TRUE \ + CTEST_OUTPUT_ON_FAILURE=TRUE \ dbus-run-session ninja -C build test } diff --git a/srcpkgs/konqueror/template b/srcpkgs/konqueror/template index d422f84b1b8d..95531cc870f5 100644 --- a/srcpkgs/konqueror/template +++ b/srcpkgs/konqueror/template @@ -16,10 +16,6 @@ homepage="https://kde.org/applications/internet/org.kde.konqueror" distfiles="${KDE_SITE}/release-service/${version}/src/konqueror-${version}.tar.xz" checksum=cf1987573b4efd8510525cc88d36eab33e76e95e0c3166e11c29ad3d00dab726 -pre_check() { - export QT_QPA_PLATFORM=offscreen -} - do_check() { : } diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template index 01a8a9f3506e..08ba65e7effd 100644 --- a/srcpkgs/kparts/template +++ b/srcpkgs/kparts/template @@ -13,10 +13,6 @@ homepage="https://invent.kde.org/frameworks/kparts" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" checksum=00ae5edf41eac55d69d5de408d755671866eeaeb1a67d9ff0b4d5bbfa28d1251 -pre_check() { - export QT_QPA_PLATFORM=offscreen -} - do_check() { : # test can not find packages assets?! } diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template index 643e884358c6..fb9d7d9a27e3 100644 --- a/srcpkgs/kpat/template +++ b/srcpkgs/kpat/template @@ -14,7 +14,3 @@ license="GPL-2.0-only" homepage="https://kde.org/applications/games/kpat" distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz" checksum=c00fed775072e33cff67ed996f66165b6f8aacc62ab82890f2e7b4a52366d282 - -pre_check() { - export QT_QPA_PLATFORM=offscreen -} diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template index b8ea9b9a9e75..9782432194d8 100644 --- a/srcpkgs/kquickcharts/template +++ b/srcpkgs/kquickcharts/template @@ -14,7 +14,6 @@ distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz" checksum=86c6cde106c786fe3908e67847f2cbbb0324b96f5589c1a10ed67654660ec7fb do_check() { - export QT_QPA_PLATFORM=offscreen cd build # QML tests require OpenGL CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E ".*\.qml" diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template index bd60dd994a85..ea14052f34f3 100644 --- a/srcpkgs/ksystemlog/template +++ b/srcpkgs/ksystemlog/template @@ -12,7 +12,3 @@ license="GPL-2.0-or-later" homepage="https://kde.org/applications/system/ksystemlog/" distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz" checksum=8aeeeccc8d35361db170ecbcd64535e96e3a2fb4daacb276db2e14bb389458ef - -pre_check() { - export QT_QPA_PLATFORM=offscreen -} diff --git a/srcpkgs/ktorrent/template b/srcpkgs/ktorrent/template index 3fc5c4d1c541..cce49311a3ff 100644 --- a/srcpkgs/ktorrent/template +++ b/srcpkgs/ktorrent/template @@ -27,10 +27,6 @@ pre_configure() { grep -rl TAGLIB_ | xargs -n1 sed -i -e "s;TAGLIB_;Taglib_;g" } -pre_check() { - export QT_QPA_PLATFORM=offscreen -} - post_install() { vdoc "${FILESDIR}/README.voidlinux" } diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template index b37225e288b7..f86a046d0c5e 100644 --- a/srcpkgs/libkcddb/template +++ b/srcpkgs/libkcddb/template @@ -13,10 +13,6 @@ homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb" distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz" checksum=ff7dab7b1d687755d186c706788ecb6f3a35db4dd6e4696a2074f80a22ae4061 -pre_check() { - export QT_QPA_PLATFORM=offscreen -} - libkcddb-devel_package() { depends="libkcddb>=${version}_${revision}" short_desc+=" - development files" diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template index 3f3b06e0d947..557b67b69710 100644 --- a/srcpkgs/libkdegames/template +++ b/srcpkgs/libkdegames/template @@ -13,10 +13,6 @@ homepage="https://kde.org/applications/games" distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz" checksum=a4efc0caf9ad877b3c01c83c69e9b3240aeda6ab14332db06e2da9f6660b4c93 -pre_check() { - export QT_QPA_PLATFORM=offscreen -} - libkdegames-devel_package() { depends="${sourcepkg}>=${version}_${revision} ${makedepends}" short_desc+=" - development files" diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template index d8987606559c..68c722c8bf1c 100644 --- a/srcpkgs/libksysguard/template +++ b/srcpkgs/libksysguard/template @@ -24,10 +24,6 @@ if [ "$XBPS_TARGET_ENDIAN" = "le" ] && [ "$XBPS_TARGET_WORDSIZE" = "$XBPS_WORDSI esac fi -pre_check() { - export QT_QPA_PLATFORM=offscreen -} - libksysguard-devel_package() { short_desc+=" - development" depends="${makedepends} ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/libktorrent/template b/srcpkgs/libktorrent/template index 2e9c150fcadb..946cd7c41a5a 100644 --- a/srcpkgs/libktorrent/template +++ b/srcpkgs/libktorrent/template @@ -17,10 +17,6 @@ if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kcoreaddons" fi -pre_check() { - export QT_QPA_PLATFORM=offscreen -} - libktorrent-devel_package() { depends="${sourcepkg}-${version}_${revision} gmp-devel" pkg_install() { diff --git a/srcpkgs/okteta/template b/srcpkgs/okteta/template index a8c011b83522..7d3878ca031a 100644 --- a/srcpkgs/okteta/template +++ b/srcpkgs/okteta/template @@ -17,10 +17,6 @@ homepage="https://apps.kde.org/okteta/" distfiles="${KDE_SITE}/okteta/${version}/src/okteta-${version}.tar.xz" checksum=c569cd5b55503e46df1a5b5c9162b08888c426aa52c6f3f2f926c658bee0144c -pre_check() { - export QT_QPA_PLATFORM=offscreen -} - okteta-devel_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template index f7e4ff3c6b15..2f7b53214e1f 100644 --- a/srcpkgs/okular/template +++ b/srcpkgs/okular/template @@ -20,7 +20,7 @@ checksum=95804e90130a4d5fdeb5f88bb3bfc29b4dbe1592c5a343786779ce9b4fa11e3d do_check() { cd build - CTEST_OUTPUT_ON_FAILURE=TRUE QT_QPA_PLATFORM=offscreen dbus-run-session ctest + CTEST_OUTPUT_ON_FAILURE=TRUE dbus-run-session ctest } libokular_package() { diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template index 4a3ef24bd9de..8f8a1435ac00 100644 --- a/srcpkgs/purpose/template +++ b/srcpkgs/purpose/template @@ -15,7 +15,6 @@ distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" checksum=a73649bae4cf36496aee27bb6391a855f6d80e23a90603f2c3700750a6e40f03 do_check() { - export QT_QPA_PLATFORM=offscreen cd build # QML test that requires OpenGL CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E 'menutest' diff --git a/srcpkgs/pyside2-tools/template b/srcpkgs/pyside2-tools/template index 7b49a46ec818..35d353aba95d 100644 --- a/srcpkgs/pyside2-tools/template +++ b/srcpkgs/pyside2-tools/template @@ -21,7 +21,3 @@ python_version=3 if [ ${CROSS_BUILD} ]; then hostmakedepends+=" qt5-qmake qt5-host-tools" fi - -pre_check() { - export QT_QPA_PLATFORM=offscreen -} diff --git a/srcpkgs/python3-jupyter_qtconsole/template b/srcpkgs/python3-jupyter_qtconsole/template index c7414fde43ea..e7c63cc20218 100644 --- a/srcpkgs/python3-jupyter_qtconsole/template +++ b/srcpkgs/python3-jupyter_qtconsole/template @@ -19,7 +19,7 @@ conflicts="python-jupyter_qtconsole<=4.4.3_2" do_check() { # flaky test - QT_QPA_PLATFORM=offscreen pytest -k 'not test_frontend_to_kernel' + pytest -k 'not test_frontend_to_kernel' } post_install() { diff --git a/srcpkgs/python3-pytest-qt/template b/srcpkgs/python3-pytest-qt/template index 0325ffe5611f..1944d757e6f5 100644 --- a/srcpkgs/python3-pytest-qt/template +++ b/srcpkgs/python3-pytest-qt/template @@ -20,9 +20,9 @@ do_check() { # isn't those 2 below tests are the real test for envvar # Why does it run just fine? local _skip='test_qapp_args or test_qt_api_ini_config or test_invalid_qt_api_envvar' - PYTHONPATH=$(pwd)/build/lib QT_QPA_PLATFORM=offscreen \ + PYTHONPATH=$(pwd)/build/lib \ PYTEST_QT_API=pyside2 python3 -m pytest -k "not ($_skip)" - PYTHONPATH=$(pwd)/build/lib QT_QPA_PLATFORM=offscreen \ + PYTHONPATH=$(pwd)/build/lib \ PYTEST_QT_API=pyqt5 python3 -m pytest -k "not ($_skip)" } diff --git a/srcpkgs/rosegarden/template b/srcpkgs/rosegarden/template index dab95b35b3ad..0194ee25c5b9 100644 --- a/srcpkgs/rosegarden/template +++ b/srcpkgs/rosegarden/template @@ -26,5 +26,4 @@ pre_check() { mkdir -p ${wrksrc}/check_xdg_runtime_dir chmod 700 ${wrksrc}/check_xdg_runtime_dir export XDG_RUNTIME_DIR=${wrksrc}/check_xdg_runtime_dir - export QT_QPA_PLATFORM=offscreen } diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template index 7edb0bfb8feb..97d9c92ac84d 100644 --- a/srcpkgs/sonnet/template +++ b/srcpkgs/sonnet/template @@ -18,10 +18,6 @@ if [ "$CROSS_BUILD" ]; then configure_args+=" -DPARSETRIGRAMS_EXECUTABLE=/usr/bin/parsetrigrams" fi -pre_check() { - export QT_QPA_PLATFORM=offscreen -} - sonnet-devel_package() { short_desc+=" - development" depends="${makedepends} ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template index 9efab1e68348..30cf4a5e089d 100644 --- a/srcpkgs/vlc/template +++ b/srcpkgs/vlc/template @@ -90,10 +90,6 @@ pre_configure() { } -pre_check() { - export QT_QPA_PLATFORM=offscreen -} - pre_install() { if [ "$CROSS_BUILD" ]; then # install .lua files instead of precompiled .luac ones From e43498b9c3f5aea38217ea16f79cd741edcf91e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Wed, 9 Jun 2021 20:19:12 +0200 Subject: [PATCH 3/5] build-style/cmake: move CTEST_OUTPUT_ON_FAILURE to environment --- common/build-style/cmake.sh | 2 +- common/environment/build-style/cmake.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh index 0fb985631ba1..a7627e7dcf21 100644 --- a/common/build-style/cmake.sh +++ b/common/build-style/cmake.sh @@ -113,7 +113,7 @@ do_check() { : ${make_check_target:=test} - CTEST_OUTPUT_ON_FAILURE=TRUE ${make_cmd} ${make_check_args} ${make_check_target} + ${make_cmd} ${make_check_args} ${make_check_target} } do_install() { diff --git a/common/environment/build-style/cmake.sh b/common/environment/build-style/cmake.sh index 9de8567f4664..c2c0c76c8efc 100644 --- a/common/environment/build-style/cmake.sh +++ b/common/environment/build-style/cmake.sh @@ -4,3 +4,5 @@ if [ "$CHROOT_READY" ]; then hostmakedepends+=" ninja" fi fi + +export CTEST_OUTPUT_ON_FAILURE=TRUE From 174bd68e90136fd4a3ae1c5646a35bba8198b5ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Wed, 9 Jun 2021 20:20:03 +0200 Subject: [PATCH 4/5] srcpkgs: remove CTEST_OUTPUT_ON_FAILURE from templates --- srcpkgs/akonadi5/template | 3 +-- srcpkgs/kcalendarcore/template | 2 +- srcpkgs/kleopatra/template | 3 +-- srcpkgs/kquickcharts/template | 2 +- srcpkgs/mariadb/template | 2 +- srcpkgs/okular/template | 2 +- srcpkgs/purpose/template | 2 +- 7 files changed, 7 insertions(+), 9 deletions(-) diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template index f02ce8d01f9a..bb1b868be450 100644 --- a/srcpkgs/akonadi5/template +++ b/srcpkgs/akonadi5/template @@ -37,8 +37,7 @@ pre_configure() { do_check() { # failing tests are disabled - sqlite tests hang on futex cd build - CTEST_OUTPUT_ON_FAILURE=TRUE \ - dbus-run-session ctest -E \ + dbus-run-session ctest -E \ "(akonadixml-xmldocument|mimetypechecker|AkonadiControl-agenttype|.*sqlite.*)test" } diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template index d10aac1980f9..443a51db9ace 100644 --- a/srcpkgs/kcalendarcore/template +++ b/srcpkgs/kcalendarcore/template @@ -19,7 +19,7 @@ do_check() { : #recorson deadlocks # Fun with timezones #cd build - #CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E "test(recurtodo|readrecurrenceid|icaltimezones|memorycalendar|timesininterval)" + #ctest -E "test(recurtodo|readrecurrenceid|icaltimezones|memorycalendar|timesininterval)" } kcalendarcore-devel_package() { diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template index 1a23001c8a5e..706a69ea4d21 100644 --- a/srcpkgs/kleopatra/template +++ b/srcpkgs/kleopatra/template @@ -15,8 +15,7 @@ distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar. checksum=c03bc7147e35d2994a0a7d323108d6b34e2e2c70768a5481bec3b04da7b6a870 do_check() { - CTEST_OUTPUT_ON_FAILURE=TRUE \ - dbus-run-session ninja -C build test + dbus-run-session ninja -C build test } post_install() { diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template index 9782432194d8..fa508c3c9ecb 100644 --- a/srcpkgs/kquickcharts/template +++ b/srcpkgs/kquickcharts/template @@ -16,5 +16,5 @@ checksum=86c6cde106c786fe3908e67847f2cbbb0324b96f5589c1a10ed67654660ec7fb do_check() { cd build # QML tests require OpenGL - CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E ".*\.qml" + ctest -E ".*\.qml" } diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template index 14dcc8f2d097..a6176b43963e 100644 --- a/srcpkgs/mariadb/template +++ b/srcpkgs/mariadb/template @@ -53,7 +53,7 @@ do_check() { fi vtargetrun ${XBPS_CROSS_BASE}/usr/bin/perl mysql-test/mtr --parallel=${XBPS_MAKEJOBS} ${mem} --force --max-test-fail=40 else - CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E "(conc336|bulk1|performance|basic-t|fetch|charset|logs|cursor|errors|view|ps|ps_bugs|sp|result|connection|misc|ps_new|thread|features-10_2|async|test-connect)" + ctest -E "(conc336|bulk1|performance|basic-t|fetch|charset|logs|cursor|errors|view|ps|ps_bugs|sp|result|connection|misc|ps_new|thread|features-10_2|async|test-connect)" fi } diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template index 2f7b53214e1f..ae314acf4ca0 100644 --- a/srcpkgs/okular/template +++ b/srcpkgs/okular/template @@ -20,7 +20,7 @@ checksum=95804e90130a4d5fdeb5f88bb3bfc29b4dbe1592c5a343786779ce9b4fa11e3d do_check() { cd build - CTEST_OUTPUT_ON_FAILURE=TRUE dbus-run-session ctest + dbus-run-session ctest } libokular_package() { diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template index 8f8a1435ac00..eda97291eac7 100644 --- a/srcpkgs/purpose/template +++ b/srcpkgs/purpose/template @@ -17,7 +17,7 @@ checksum=a73649bae4cf36496aee27bb6391a855f6d80e23a90603f2c3700750a6e40f03 do_check() { cd build # QML test that requires OpenGL - CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E 'menutest' + ctest -E 'menutest' } purpose-devel_package() { From d84ead90393ef9f4fe5caac17104cb873ebf685d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Wed, 9 Jun 2021 20:20:51 +0200 Subject: [PATCH 5/5] ark: fix tests --- srcpkgs/ark/template | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template index 8023bb71b7de..7a1e9c49c595 100644 --- a/srcpkgs/ark/template +++ b/srcpkgs/ark/template @@ -7,7 +7,7 @@ configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" hostmakedepends="extra-cmake-modules qt5-devel qt5-qmake kdoctools kconfig gettext pkg-config python3 kcoreaddons kparts" makedepends="libarchive-devel kpty-devel kparts-devel kitemmodels-devel libzip-devel" -checkdepends="xvfb-run p7zip p7zip-unrar lzop lrzip unrar unzip zip zstd" +checkdepends="p7zip p7zip-unrar lzop lrzip unrar unzip zip zstd" short_desc="KDE Archiving Tool" maintainer="John " license="GPL-2.0-or-later" @@ -16,9 +16,7 @@ distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar. checksum=9113e3f1e7c0bc660d8fe56d883b02ba0997c3a7362838e365c6c71bf60662ef do_check() { - : - # XXX: Doesn't find test archives (?) - #cd build - #CTEST_OUTPUT_ON_FAILURE=TRUE QT_QPA_PLATFORM=offscreen \ - # ctest -E 'plugins-cliunarchivertest' + cd build + # requires rar compressor + ctest -E plugins-clirartest }