add REGRESS_EXPECTED_FAILURES variable,

for those tests that are expected to fail because they're not yet
implemented.

okay bluhm@

3 files changed, 20 insertions, 6 deletions

diff --git a/share/man/man5/bsd.regress.mk.5 b/share/man/man5/bsd.regress.mk.5
index ed0615792fb..f72dfab6115 100644
--- a/share/man/man5/bsd.regress.mk.5
+++ b/share/man/man5/bsd.regress.mk.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bsd.regress.mk.5,v 1.19 2019/05/14 16:43:26 bluhm Exp $
+.\" $OpenBSD: bsd.regress.mk.5,v 1.20 2019/06/17 17:20:24 espie Exp $
 .\"
 .\" Copyright (c) 2002 Anil Madhavapeddy
 .\" Copyright (c) 2000 Marc Espie
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 14 2019 $
+.Dd $Mdocdate: June 17 2019 $
 .Dt BSD.REGRESS.MK 5
 .Os
 .Sh NAME
@@ -69,6 +69,10 @@ then a failure is logged, otherwise the test is marked as a success.
 .It Ev REGRESS_CLEANUP
 If this variable is set, it contains a target that is executed
 after all regress targets.
+.It Ev REGRESS_EXPECTED_FAILURES
+Targets which are expected to fail.
+Specifically: sometimes tests are added for features that should be
+supported eventually, but are somewhat complicated to fix right away.
 .It Ev REGRESS_FAIL_EARLY
 If this variable is set to anything but
 .Dq no ,
diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index 669f5402361..474e09f60df 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -1,4 +1,4 @@
-#	$OpenBSD: bsd.README,v 1.81 2019/04/02 12:59:56 jsg Exp $
+#	$OpenBSD: bsd.README,v 1.82 2019/06/17 17:20:24 espie Exp $
 #	$NetBSD: bsd.README,v 1.17 1996/04/13 02:08:08 thorpej Exp $
 #	@(#)bsd.README	5.1 (Berkeley) 5/11/90
 
@@ -11,11 +11,11 @@ bsd.lib.mk		- support for building libraries
 bsd.man.mk		- installing manual pages and their links
 bsd.obj.mk		- creating 'obj' directories and cleaning up
 bsd.own.mk		- define common variables
-bsd.port.mk		- building ports
+bsd.port.mk		- building ports (see bsd.port.mk(5)) 
 bsd.port.arch.mk	- glue for building ports with MD stuff
 bsd.port.subdir.mk	- targets for building subdirectories for ports
 bsd.prog.mk		- building programs from source files
-bsd.regress.mk		- regression tests
+bsd.regress.mk		- regression tests (see bsd.regress.mk(5))
 bsd.subdir.mk		- targets for building subdirectories
 bsd.sys.mk		- overrides for <sys.mk> for building OpenBSD
 sys.mk			- global default rules, mostly POSIX
diff --git a/share/mk/bsd.regress.mk b/share/mk/bsd.regress.mk
index b54e3fcf776..b66b1e4b5a7 100644
--- a/share/mk/bsd.regress.mk
+++ b/share/mk/bsd.regress.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: bsd.regress.mk,v 1.20 2019/06/15 07:30:26 espie Exp $
+# $OpenBSD: bsd.regress.mk,v 1.21 2019/06/17 17:20:24 espie Exp $
 # Documented in bsd.regress.mk(5)
 
 # No man pages for regression tests.
@@ -62,6 +62,7 @@ REGRESS_SKIP_TARGETS+=${REGRESS_ROOT_TARGETS}
 .  endif
 .endif
 
+REGRESS_EXPECTED_FAILURES?=
 REGRESS_SETUP?=
 REGRESS_SETUP_ONCE?=
 REGRESS_CLEANUP?=
@@ -86,6 +87,15 @@ regress: .SILENT
 .  if ${REGRESS_SKIP_TARGETS:M${RT}}
 	echo -n "SKIP " ${_REGRESS_OUT}
 	echo SKIPPED
+.  elif ${REGRESS_EXPECTED_FAILURES:M${RT}}
+	if ${MAKE} -C ${.CURDIR} ${RT}; then \
+	    echo -n "XPASS " ${_REGRESS_OUT} ; \
+	    echo UNEXPECTED_PASS; \
+	    ${_REGRESS_FAILED}; \
+	else \
+	    echo -n "XFAIL " ${_REGRESS_OUT} ; \
+	    echo EXPECTED_FAIL; \
+	fi
 .  else
 	if ${MAKE} -C ${.CURDIR} ${RT}; then \
 	    echo -n "SUCCESS " ${_REGRESS_OUT} ; \