cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow ports to set REGRESS_IS_INTERACTIVE=X11 in order to get rid of

Browse Source 
redundant makefile parts found at many places in the tree

DISPLAY and XAUTHORITY variables/checks to be nuked soon from many ports

ok ajacoutot@, sthen@, jasper@
This commit is contained in:
simon 2009-05-16 22:18:50 +00:00
parent efeb1957e8
commit f9808159d2
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
infrastructure/mk/bsd.port.mk
View File

@ -1,6 +1,6 @@
#-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make:
# $OpenBSD: bsd.port.mk,v 1.962 2009/05/05 20:58:38 martynas Exp $
# $OpenBSD: bsd.port.mk,v 1.963 2009/05/16 22:18:50 simon Exp $
# $FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $
# $NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $
#
@ -623,6 +623,11 @@ REGRESS_LOGFILE ?= ${WRKDIR}/regress.log
REGRESS_LOG ?= | tee ${REGRESS_LOGFILE}
REGRESS_STATUS_IGNORE ?=
.if defined(REGRESS_IS_INTERACTIVE) && ${REGRESS_IS_INTERACTIVE:L} == "x11"
REGRESS_FLAGS += DISPLAY=${DISPLAY} XAUTHORITY=${XAUTHORITY}
XAUTHORITY ?= ${HOME}/.Xauthority
.endif
_PACKAGE_COOKIE_DEPS=${_FAKE_COOKIE}
.for _s in ${MULTI_PACKAGES}
@ -2203,6 +2208,16 @@ ${_BUILD_COOKIE}: ${_CONFIGURE_COOKIE}
${_REGRESS_COOKIE}: ${_BUILD_COOKIE}
.if ${NO_REGRESS:L} == "no"
@${ECHO_MSG} "===> Regression check for ${FULLPKGNAME}${_MASTER}"
# When interactive tests need X11
. if defined(REGRESS_IS_INTERACTIVE) && ${REGRESS_IS_INTERACTIVE:L} == "x11"
. if !defined(DISPLAY) || !exists(${XAUTHORITY})
@echo 1>&2 "The regression tests require a running instance of X."
@echo 1>&2 "You will also need to set the environment variable DISPLAY"
@echo 1>&2 "to point to an active X11 display and XAUTHORITY to point"
@echo 1>&2 "to the appropriate .Xauthority file."
@exit 1
. endif
. endif
. if target(pre-regress)
@cd ${.CURDIR} && exec ${MAKE} pre-regress
. endif