From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DF8C915808B for ; Mon, 4 Apr 2022 01:31:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 56EBDE0909; Mon, 4 Apr 2022 01:31:57 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 42CB0E08CD for ; Mon, 4 Apr 2022 01:31:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1A4ED34137B for ; Mon, 4 Apr 2022 01:31:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8686BD0 for ; Mon, 4 Apr 2022 01:31:52 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1649035680.2f275a47a864b0c18984da0b02d968ff1361920e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/qgis/qgis-9999.ebuild X-VCS-Directories: sci-geosciences/qgis/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 2f275a47a864b0c18984da0b02d968ff1361920e X-VCS-Branch: master Date: Mon, 4 Apr 2022 01:31:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4116de8f-2fc5-4ec4-95fb-35f5eca79987 X-Archives-Hash: 2926e1711ec94176bd5f04d69a308af8 commit: 2f275a47a864b0c18984da0b02d968ff1361920e Author: Thomas Bettler gmail com> AuthorDate: Sun Apr 3 20:14:56 2022 +0000 Commit: Sam James gentoo org> CommitDate: Mon Apr 4 01:28:00 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f275a47 sci-geosciences/qgis: add test Signed-off-by: Thomas Bettler gmail.com> Closes: https://github.com/gentoo/gentoo/pull/24885 Signed-off-by: Sam James gentoo.org> sci-geosciences/qgis/qgis-9999.ebuild | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild index 157d86c11aaf..2ef1f49d303e 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-9999.ebuild @@ -14,19 +14,19 @@ else examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )" KEYWORDS="~amd64 ~x86" fi -inherit cmake python-single-r1 xdg +inherit cmake python-single-r1 virtualx xdg DESCRIPTION="User friendly Geographic Information System" HOMEPAGE="https://www.qgis.org/" LICENSE="GPL-2+ GPL-3+" SLOT="0" -IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial" +IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial test" REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" # Disabling test suite because upstream disallow running from install path -RESTRICT="test" +RESTRICT="!test? ( test )" # 3.22.5+ *does* support GRASS 8 but we can't enable it yet because of # https://github.com/OSGeo/grass/pull/2269 (=> unresolved SONAME dependencies) @@ -112,6 +112,13 @@ BDEPEND=" dev-qt/linguist-tools:5 sys-devel/bison sys-devel/flex + test? ( + $(python_gen_cond_dep ' + dev-python/PyQt5[${PYTHON_USEDEP},testlib] + dev-python/nose2[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + ') + ) " pkg_setup() { @@ -137,7 +144,7 @@ src_configure() { -DWITH_GUI=ON -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538 -DWITH_QSPATIALITE=ON - -DENABLE_TESTS=OFF + -DENABLE_TESTS=$(usex test) -DWITH_3D=$(usex 3d) -DWITH_GSL=$(usex georeferencer) $(cmake_use_find_package hdf5 HDF5) @@ -202,8 +209,7 @@ src_configure() { done fi - use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) || - mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973 + use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) # bugs 612956, 648726 addpredict /dev/dri/renderD128 @@ -234,6 +240,17 @@ src_install() { fi } +src_test() { + myctestargs+=( -j1 ) + myctestargs+=( -E '(ProcessingGuiTest|ProcessingQgisAlgorithmsTestPt1|ProcessingQgisAlgorithmsTestPt2|ProcessingQgisAlgorithmsTestPt3|ProcessingQgisAlgorithmsTestPt4|ProcessingGdalAlgorithmsRasterTest|ProcessingGdalAlgorithmsVectorTest|ProcessingGrass7AlgorithmsImageryTest|ProcessingGrass7AlgorithmsRasterTestPt1|ProcessingGrass7AlgorithmsRasterTestPt2|ProcessingGrass7AlgorithmsVectorTest|ProcessingOtbAlgorithmsTest|test_core_callout|test_core_compositionconverter|test_core_expression|test_core_gdalprovider|test_core_gdalutils|test_core_geonodeconnection|test_core_imagecache|test_core_labelingengine|test_core_layout|test_core_layoutcontext|test_core_layouthtml|test_core_layoutlabel|test_core_layoutmanualtable|test_core_layoutmap|test_core_layoutmapgrid|test_core_layoutmapoverview|test_core_layoutmultiframe|test_core_layoutpicture|test_core_linefillsymbol|test_core_mapdevicepixelratio|test_core_maprendererjob|test_core_meshlayer|test_core_meshlayerrenderer|test_core_networkaccessmana ger|test_core_offlineediting|test_core_pointpatternfillsymbol|test_core_rastercontourrenderer|test_core_rasterlayer|test_core_simplemarker|test_core_style|test_core_svgmarker|test_core_tiledownloadmanager|test_core_ziplayer|test_core_coordinatereferencesystem|test_core_geometry|test_gui_dualview|test_gui_htmlwidgetwrapper|test_gui_processinggui|test_gui_filedownloader|test_gui_ogrprovidergui|test_gui_meshlayerpropertiesdialog|test_gui_queryresultwidget|test_gui_listwidget|test_3d_3drendering|test_3d_tessellator|test_analysis_processingalgspt1|test_analysis_processingalgspt2|test_analysis_meshcontours|test_analysis_triangulation|test_analysis_processing|test_provider_wcsprovider|test_provider_postgresconn|test_provider_virtualrasterprovider|qgis_grassprovidertest8|test_app_qgisappclipboard|test_app_fieldcalculator|test_app_maptoolcircularstring|test_app_vertextool|PyQgsLocalServer|PyQgsAFSProvider|PyQgsPythonProvider|PyQgsAnnotation|PyQgsAuthenticationSystem|PyQgsAuthBasicMethod|PyQg sDataItem|PyQgsDelimitedTextProvider|PyQgsEmbeddedSymbolRenderer|PyQgsExpressionBuilderWidget|PyQgsExternalStorageWebDAV|PyQgsGeometryTest|PyQgsGoogleMapsGeocoder|PyQgsImageCache|PyQgsLayout|PyQgsLayoutHtml|PyQgsLayoutLegend|PyQgsLayoutMap|PyQgsLayoutMapGrid|PyQgsLayoutMapOverview|PyQgsMapClippingUtils|PyQgsMapLayerComboBox|PyQgsMapLayerProxyModel|PyQgsMemoryProvider|PyQgsOGRProviderGpkg|PyQgsPalLabelingCanvas|PyQgsPalLabelingLayout|PyQgsPalLabelingPlacement|PyQgsPointCloudAttributeByRampRenderer|PyQgsPointCloudClassifiedRenderer|PyQgsPointCloudExtentRenderer|PyQgsPointCloudRgbRenderer|PyQgsProcessExecutable|PyQgsProcessingInPlace|TestQgsRandomMarkerSymbolLayer|PyQgsRasterLayer|PyQgsRasterLayerRenderer|PyQgsRasterResampler|PyQgsRulebasedRenderer|PyQgsShapefileProvider|PyQgsSvgCache|PyQgsOGRProvider|PyQgsSpatialiteProvider|PyQgsTaskManager|PyQgsVectorFileWriter|PyQgsVectorLayer|PyQgsVectorLayerCache|PyQgsVectorLayerEditBuffer|PyQgsVectorLayerSelectedFeatureSource|PyQgsVectorLayerShap efile|PyQgsVirtualLayerProvider|PyQgsWFSProvider|PyQgsOapifProvider|PyQgsDBManagerGpkg|PyQgsAuxiliaryStorage|PyQgsFieldValidator|PyQgsSelectiveMasking|PyQgsPalLabelingServer|PyQgsServerWMSGetMap|PyQgsServerWMSGetLegendGraphic|PyQgsServerWMSGetPrint|PyQgsServerWMSGetPrintExtra|PyQgsServerWMSGetPrintOutputs|PyQgsServerWMSGetPrintAtlas|PyQgsServerWMSDimension|PyQgsServerAccessControlWMS|PyQgsServerAccessControlWFSTransactional|PyQgsServerCacheManager|PyQgsServerWMTS|PyQgsServerWFS|qgis_sipify|qgis_sip_include|qgis_sip_uptodate)' ) + # test_core_gdalprovider - see https://github.com/qgis/QGIS/pull/47887 + # test_core_offlineediting - see https://github.com/qgis/QGIS/pull/48059 + + myctestargs+=( --output-on-failure ) + + virtx cmake_src_test +} + pkg_postinst() { if use postgres; then elog "If you don't intend to use an external PostGIS server"