From c2fdc45482ab3136de6ac6e03e62849bf892495e Mon Sep 17 00:00:00 2001 From: bluhm Date: Sun, 25 Jun 2017 22:06:06 +0000 Subject: [PATCH] Do not run .END cleanup during clean, cleandir, obj in ldapd regress. --- regress/usr.sbin/ldapd/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/regress/usr.sbin/ldapd/Makefile b/regress/usr.sbin/ldapd/Makefile index 1fd77df2e85..55cf66f618b 100644 --- a/regress/usr.sbin/ldapd/Makefile +++ b/regress/usr.sbin/ldapd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2017/02/22 14:36:20 gsoares Exp $ +# $OpenBSD: Makefile,v 1.8 2017/06/25 22:06:06 bluhm Exp $ OUT=${.CURDIR}/out DIT=dc=example,dc=com @@ -37,8 +37,12 @@ bootstrap: @sleep 1 @grep -a startup ${.OBJDIR}/log |sed -e 's/.*\[// ; s/\].*//' > ${.OBJDIR}/ldapd.pid +.if ! (make(clean) || make(cleandir) || make(obj)) .END: - @[ -f ${.OBJDIR}/ldapd.pid ] && ${SUDO} kill $$(cat ${.OBJDIR}/ldapd.pid) && rm ${.OBJDIR}/ldapd.pid + @[ -f ${.OBJDIR}/ldapd.pid ] &&\ + ${SUDO} kill $$(cat ${.OBJDIR}/ldapd.pid) &&\ + rm ${.OBJDIR}/ldapd.pid +.endif connect: bootstrap -ldapsearch -x -H ldapi://%2ftmp%2fldapi | diff - ${OUT}/empty.log -- 2.20.1