svn commit: r354801 - in head: contrib/netbsd-tests/usr.bin/unifdef etc/mtree usr.bin/unifdef usr.bin/unifdef/tests

[Conrad Meyer]

Author: cem
Date: Mon Nov 18 04:03:11 2019
New Revision: 354801
URL: https://svnweb.freebsd.org/changeset/base/354801

Log:
  Link in NetBSD's unifdef(1) tests
  
  Skip one, is it currently fails.

Added:
  head/usr.bin/unifdef/tests/
  head/usr.bin/unifdef/tests/Makefile   (contents, props changed)
Modified:
  head/contrib/netbsd-tests/usr.bin/unifdef/t_basic.sh
  head/etc/mtree/BSD.tests.dist
  head/usr.bin/unifdef/Makefile

Modified: head/contrib/netbsd-tests/usr.bin/unifdef/t_basic.sh
==============================================================================
--- head/contrib/netbsd-tests/usr.bin/unifdef/t_basic.sh	Mon Nov 18 01:56:19 2019	(r354800)
+++ head/contrib/netbsd-tests/usr.bin/unifdef/t_basic.sh	Mon Nov 18 04:03:11 2019	(r354801)
@@ -51,6 +51,10 @@ lastline_body() {
 	printf '#ifdef foo\n#endif\n' >input
 	atf_check -o file:input unifdef -Ubar input
 
+	# Begin FreeBSD
+	atf_skip "our version doesn't have this behavior"
+	# Endif
+
 	# Without newline after cpp directive
 	printf '#ifdef foo\n#endif' >input
 	atf_check -o file:input unifdef -Ubar input

Modified: head/etc/mtree/BSD.tests.dist
==============================================================================
--- head/etc/mtree/BSD.tests.dist	Mon Nov 18 01:56:19 2019	(r354800)
+++ head/etc/mtree/BSD.tests.dist	Mon Nov 18 04:03:11 2019	(r354801)
@@ -1064,6 +1064,8 @@
         ..
         uuencode
         ..
+        unifdef
+        ..
         uniq
         ..
         vmstat

Modified: head/usr.bin/unifdef/Makefile
==============================================================================
--- head/usr.bin/unifdef/Makefile	Mon Nov 18 01:56:19 2019	(r354800)
+++ head/usr.bin/unifdef/Makefile	Mon Nov 18 04:03:11 2019	(r354801)
@@ -1,8 +1,13 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 PROG=	unifdef
 SCRIPTS=unifdefall.sh
 MLINKS=	unifdef.1 unifdefall.1
+
+HAS_TESTS=
+SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>

Added: head/usr.bin/unifdef/tests/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/usr.bin/unifdef/tests/Makefile	Mon Nov 18 04:03:11 2019	(r354801)
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+PACKAGE=	tests
+
+NETBSD_ATF_TESTS_SH=	basic_test
+
+${PACKAGE}FILES+=	d_basic.in
+${PACKAGE}FILES+=	d_basic.out
+
+.include <netbsd-tests.test.mk>
+
+.include <bsd.test.mk>