diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-06-08 15:45:39 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-06-08 15:45:39 +0100 |
| commit | d5599da3055bf9b900513a61c3c6e4bdbb524503 (patch) | |
| tree | b64a792286dd490c9d4fc2c46bbbaa64804efc61 /eclass | |
| parent | cfeee79886441e92c8ee094e45b9bcdc9c79137a (diff) | |
gentoo auto-resync : 08:06:2023 - 15:45:39
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 37807 -> 37808 bytes | |||
| -rw-r--r-- | eclass/ecm.eclass | 10 |
2 files changed, 8 insertions, 2 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex c8c7e491e5f9..27767491831b 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index 20a41300e5e0..ae7e44706b0e 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 @@ -587,13 +591,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 |