Date: Wed, 07 Jan 2026 08:41:31 +0000 From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a82ed0739d4f - main - Uses/dbus-testing.mk: Print pretty messages rather than raw shell incantations Message-ID: <695e1c3b.8683.2e63d6ec@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=a82ed0739d4f8dcdc28ba7053b0205861c613f6a commit a82ed0739d4f8dcdc28ba7053b0205861c613f6a Author: Gleb Popov <arrowd@FreeBSD.org> AuthorDate: 2026-01-04 15:45:08 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2026-01-07 08:41:15 +0000 Uses/dbus-testing.mk: Print pretty messages rather than raw shell incantations --- Mk/Uses/dbus-testing.mk | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Mk/Uses/dbus-testing.mk b/Mk/Uses/dbus-testing.mk index 1c0046897d43..411b169cc422 100644 --- a/Mk/Uses/dbus-testing.mk +++ b/Mk/Uses/dbus-testing.mk @@ -24,6 +24,7 @@ _USES_test= 299:dbus-testing-pre-test \ 801:dbus-testing-post-test dbus-testing-pre-test: + @${ECHO_CMD} "===> Starting dbus testing instances" . if defined(PACKAGE_BUILDING) && ${UID} == 0 # When running in Poudriere we can afford installing a permissive config # that allows anyone to own any D-Bus name. This is useful for running tests @@ -31,25 +32,26 @@ dbus-testing-pre-test: ${INSTALL_DATA} ${_DBUS_LOCAL_CONF_SRC} ${_DBUS_LOCAL_CONF_DST} . endif # Start the system bus via rc script - (/usr/sbin/service dbus onestatus && \ + @(/usr/sbin/service dbus onestatus && \ ${TOUCH} ${_ALREADY_STARTED_COOKIE}) || ${TRUE} - /usr/sbin/service dbus onestart || ${TRUE} + @/usr/sbin/service dbus onestart || ${TRUE} # Now start an isolated session bus. This is complicated because 'make test' # wraps everything into ${SETENVI}, so we can't easily pass the bus address via # environment. Instead we put the bus' socket under a well-known path # ${_SESSION_BUS_SOCKET} and pass it to make via usual ${TEST_ENV}. # Typical value for DBUS_SESSION_BUS_ADDRESS looks like # unix:path=/tmp/dbus-xZF47bxeMf,guid=227e19aaa3a87a1bbdb96cd56901b7e0 - session_bus_env=$$(${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${_DBUS_LAUNCH} | ${XARGS}) ; \ + @session_bus_env=$$(${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${_DBUS_LAUNCH} | ${XARGS}) ; \ session_bus_sock=$$(echo $$session_bus_env | grep -o 'path=.*' | sed -e 's|path=||' -e 's|,.*||') ; \ ${LN} -fs $$session_bus_sock ${_SESSION_BUS_SOCKET} ;\ ${SETENVI} $$session_bus_env ${SH} -c 'echo $$DBUS_SESSION_BUS_PID' > ${_SESSION_BUS_PIDFILE} dbus-testing-post-test: - (${CAT} ${_SESSION_BUS_PIDFILE} | ${XARGS} kill) || ${TRUE} - ${RM} ${_SESSION_BUS_SOCKET} ${_SESSION_BUS_PIDFILE} - [ ! -f ${_ALREADY_STARTED_COOKIE} ] && \ + @${ECHO_CMD} "===> Stopping dbus testing instances" + @(${CAT} ${_SESSION_BUS_PIDFILE} | ${XARGS} kill) || ${TRUE} + @${RM} ${_SESSION_BUS_SOCKET} ${_SESSION_BUS_PIDFILE} + @[ ! -f ${_ALREADY_STARTED_COOKIE} ] && \ /usr/sbin/service dbus onestop || ${TRUE} - ${RM} ${_ALREADY_STARTED_COOKIE} + @${RM} ${_ALREADY_STARTED_COOKIE} .endifhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?695e1c3b.8683.2e63d6ec>