From nobody Tue Nov 26 16:45:54 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XyT3Q40Vhz5fhDg; Tue, 26 Nov 2024 16:45:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XyT3Q3Qxvz4sjC; Tue, 26 Nov 2024 16:45:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732639554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+IwohDYjhEjq6VOfNWbagn5GDY3/D9robm0n2Kx3Aro=; b=ZSchxXHOE7397Lrb0dFi8Wkzkf6SpfCRxld1GsuwX3AEp0HL+tK0FD0Vhspn6EsvknxabN uZMCdc9osXWdmAHuWL/p7PQYjAzFVhZ37tDqhTZWFvPp1I7dEBu+++obk24paOzjblcjZi lpfb/ma1IjteQy2COPnsIGSq5enUVICSapFCu4vsvl9qt7VBPtpD5z4iLZc9KScl8chwRw i1/9t1xpTBbMeFkmI+hOWZcc8d6yqAawwA45xe8lR9U6xs/AeMaK1XjQKS8MLWZe/dHmrM SHqc/J8cLaTC0IM2o1p4EDrVc3FwfvOa/RWm1bume7xtfAARKQuB4DvZdHhcmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732639554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+IwohDYjhEjq6VOfNWbagn5GDY3/D9robm0n2Kx3Aro=; b=V6Bu4qsT/EDv3+Qq2BN0ow4uWxMa5jm96aqAsUoRTY9+MX5aMiqzd4iJ9hnJ18ALVWF0Wc eDV8lSV6/kWalFu6Epw8en5czIB4X0yqkQg97fTv8oL6FM4yiboJFKWqyFVdRskc0h6d1x xm7BW7EIQ3NOmsM5BADNTwDa2XqWvorIw2FJvBXpCLCoze6lp1unN9i4aGnS/HgpJhXrAN LZGXdQG4ILGsf59lOkftGWRtPde6QdtepyoFghQwyUFzfDdlcHYnepc1wKCaQkmus1D+ni lF00IYFLUKWazIUbWRN03ewTU+pu272k1DotDS1SFTVu+b+JFuwb6sL1B04t3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732639554; a=rsa-sha256; cv=none; b=oaN/tT96CRmeSAwKRohnEVwsP8LcgU0ybBHI8c0ofkDYpsdpOGEAnuftsgizGEk3l05Qgu MB2lrIG7JDLhdQQgkZUCr9OcXlp0kW7Ykh8FaQ3Q0izruVlklnMo5HDd0U7F8Lx9GvirzL 9Zuhfl09QedbF8UDJZQzXGrVIfmegsn/lOOKN8dPsgAyXMsdL0o+lMzcWiuYDf31e0ckGd 88H0B1l7x83XqPuSlMPzc1uyG/MfJ2BpQncdpvs+WMLWP1BTgmCzl1ReRxLfSL0BU3wQxA nsIqrSERQmSsxd4MW4duM6RQx3ZdTQRLE072QL5WtAYC4+eyiltTnUyfCGJGqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XyT3Q2SrPzYmB; Tue, 26 Nov 2024 16:45:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AQGjs9q005799; Tue, 26 Nov 2024 16:45:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AQGjsDJ005796; Tue, 26 Nov 2024 16:45:54 GMT (envelope-from git) Date: Tue, 26 Nov 2024 16:45:54 GMT Message-Id: <202411261645.4AQGjsDJ005796@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: fc999570716f - main - Mk/Uses/cmake.mk: Add CMAKE_TESTING_SETENV List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc999570716fed53681c943136e8f3f674631326 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=fc999570716fed53681c943136e8f3f674631326 commit fc999570716fed53681c943136e8f3f674631326 Author: Jason E. Hale AuthorDate: 2024-11-26 09:10:17 +0000 Commit: Jason E. Hale CommitDate: 2024-11-26 16:45:47 +0000 Mk/Uses/cmake.mk: Add CMAKE_TESTING_SETENV Defining this variable in an individual port Makefile sets the environment for building and, more importantly, running the target defined by CMAKE_TESTING_TARGET with SETENV instead of SETENVI. Certain tests may require a running X or Wayland session to function and SETENVI discards important environment variables like DISPLAY and XAUTHORITY that cause these tests to fail or segfault. --- Mk/Uses/cmake.mk | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Mk/Uses/cmake.mk b/Mk/Uses/cmake.mk index d1d1eb1057d3..1a4bf338b456 100644 --- a/Mk/Uses/cmake.mk +++ b/Mk/Uses/cmake.mk @@ -53,6 +53,10 @@ # Default: BUILD_TESTING # CMAKE_TESTING_OFF Appends -D:bool=OFF to the CMAKE_TESTING_ARGS. # Default: empty +# CMAKE_TESTING_SETENV - Use SETENV instead of SETENVI to run the tests. +# Useful for tests that require a running X or Wayland +# session to keep enviroment variables like DISPLAY. +# Default: undefined, set to any value to enable. # CMAKE_TESTING_TARGET - Name of the test target. Default: test # # MAINTAINER: kde@FreeBSD.org @@ -185,6 +189,13 @@ CMAKE_TESTING_ON?= BUILD_TESTING CMAKE_TESTING_PARALLEL_LEVEL?= ${MAKE_JOBS_NUMBER} CMAKE_TESTING_TARGET?= test +# Use SETENV instead of SETENVI if CMAKE_TESTING_SETENV is defined +. if defined(CMAKE_TESTING_SETENV) +_CMAKE_TESTING_SETENV= ${SETENV} +. else +_CMAKE_TESTING_SETENV= ${SETENVI} +. endif + # Handle the option-like CMAKE_TESTING_ON and CMAKE_TESTING_OFF lists. . for _bool_kind in ON OFF . if defined(CMAKE_TESTING_${_bool_kind}) @@ -196,7 +207,7 @@ do-test: @cd ${BUILD_WRKSRC} && \ ${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_TESTING_ARGS} ${CMAKE_SOURCE_PATH} && \ ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} && \ - ${SETENVI} ${WRK_ENV} ${TEST_ENV} CTEST_PARALLEL_LEVEL=${CMAKE_TESTING_PARALLEL_LEVEL} ${MAKE_CMD} ${MAKE_ARGS} ${CMAKE_TESTING_TARGET} + ${_CMAKE_TESTING_SETENV} ${WRK_ENV} ${TEST_ENV} CTEST_PARALLEL_LEVEL=${CMAKE_TESTING_PARALLEL_LEVEL} ${MAKE_CMD} ${MAKE_ARGS} ${CMAKE_TESTING_TARGET} . endif . endif