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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5315115806E for ; Sat, 27 May 2023 06:52:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 864EDE084A; Sat, 27 May 2023 06:52:43 +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 6428BE084A for ; Sat, 27 May 2023 06:52:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 42FAF340D1F for ; Sat, 27 May 2023 06:52:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A0A3DA6C for ; Sat, 27 May 2023 06:52:40 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1685170328.af9f38d884d0a009f06774f68c7cf9b3498c12d3.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/ecm.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: af9f38d884d0a009f06774f68c7cf9b3498c12d3 X-VCS-Branch: master Date: Sat, 27 May 2023 06:52:40 +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: e0e64556-60eb-491e-a78f-02498af6eff4 X-Archives-Hash: 3b6c76a9c29ada3a6ebd8dbdfe3f82ab commit: af9f38d884d0a009f06774f68c7cf9b3498c12d3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu May 25 20:04:48 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat May 27 06:52:08 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=af9f38d8 ecm.eclass: Use QT_QPA_PLATFORM=offscreen instead of virtualx.eclass Keep inheriting virtualx.eclass since it is expected from ecm.eclass for now. Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/ecm.eclass | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index 542993b6ec..59c6fac220 100644 --- a/eclass/ecm.eclass +++ b/eclass/ecm.eclass @@ -29,6 +29,9 @@ esac if [[ -z ${_ECM_ECLASS} ]]; then _ECM_ECLASS=1 +inherit cmake flag-o-matic toolchain-funcs + +if [[ ${EAPI} == 8 ]]; then # @ECLASS_VARIABLE: VIRTUALX_REQUIRED # @DESCRIPTION: # For proper description see virtualx.eclass manpage. @@ -36,7 +39,8 @@ _ECM_ECLASS=1 # for tests you should proceed with setting VIRTUALX_REQUIRED=test. : "${VIRTUALX_REQUIRED:=manual}" -inherit cmake flag-o-matic toolchain-funcs virtualx +inherit virtualx +fi # @ECLASS_VARIABLE: ECM_NONGUI # @DEFAULT_UNSET @@ -610,13 +614,15 @@ ecm_src_test() { KDE_DEBUG=1 cmake_src_test } + local -x QT_QPA_PLATFORM=offscreen + # When run as normal user during ebuild development with the ebuild command, # tests tend to access the session DBUS. This however is not possible in a # real emerge or on the tinderbox. # make sure it does not happen, so bad tests can be recognized and disabled unset DBUS_SESSION_BUS_ADDRESS DBUS_SESSION_BUS_PID - if [[ ${VIRTUALX_REQUIRED} = always || ${VIRTUALX_REQUIRED} = test ]]; then + if [[ ${EAPI} == 8 ]] && [[ ${VIRTUALX_REQUIRED} = always || ${VIRTUALX_REQUIRED} = test ]]; then virtx _test_runner else _test_runner