Module Name: src
Committed By: snj
Date: Sun Mar 15 23:01:46 UTC 2015
Modified Files:
src/tests/usr.bin/config/support/conf [netbsd-7]: Makefile
Added Files:
src/tests/usr.bin/config/support/conf [netbsd-7]: Makefile.kern.inc
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #596):
distrib/sets/lists/tests/mi: revision 1.604
tests/usr.bin/config/support/conf/Makefile: revision 1.2
tests/usr.bin/config/support/conf/Makefile.kern.inc: revision 1.1
config(1): Fix test breakage
Now config(1) checks the content of $S/conf/Makefile.kern.inc. Install it
into config(1) test directory to fix test. Noticed by Martin Husemann.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.12.1 src/tests/usr.bin/config/support/conf/Makefile
cvs rdiff -u -r0 -r1.1.2.2 \
src/tests/usr.bin/config/support/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/config/support/conf/Makefile
diff -u src/tests/usr.bin/config/support/conf/Makefile:1.1 src/tests/usr.bin/config/support/conf/Makefile:1.1.12.1
--- src/tests/usr.bin/config/support/conf/Makefile:1.1 Sat Mar 17 16:33:12 2012
+++ src/tests/usr.bin/config/support/conf/Makefile Sun Mar 15 23:01:46 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2012/03/17 16:33:12 jruoho Exp $
+# $NetBSD: Makefile,v 1.1.12.1 2015/03/15 23:01:46 snj Exp $
.include <bsd.own.mk>
@@ -6,7 +6,8 @@ TESTSDIR= ${TESTSBASE}/usr.bin/config
ATFFILE= no
FILESDIR= ${TESTSDIR}/support/conf
-FILES= files
+FILES= Makefile.kern.inc \
+ files
.include <bsd.test.mk>
.include <bsd.files.mk>
Added files:
Index: src/tests/usr.bin/config/support/conf/Makefile.kern.inc
diff -u /dev/null src/tests/usr.bin/config/support/conf/Makefile.kern.inc:1.1.2.2
--- /dev/null Sun Mar 15 23:01:46 2015
+++ src/tests/usr.bin/config/support/conf/Makefile.kern.inc Sun Mar 15 23:01:46 2015
@@ -0,0 +1,4 @@
+# $NetBSD: Makefile.kern.inc,v 1.1.2.2 2015/03/15 23:01:46 snj Exp $
+
+build_kernel: .USE
+ XXX
