Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-7]: src/tests/usr.bin/config/support/conf Pull up following revis...
details: https://anonhg.NetBSD.org/src/rev/cc50741b0aa4
branches: netbsd-7
changeset: 799089:cc50741b0aa4
user: snj <snj%NetBSD.org@localhost>
date: Sun Mar 15 23:01:46 2015 +0000
description:
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.
diffstat:
tests/usr.bin/config/support/conf/Makefile | 5 +++--
tests/usr.bin/config/support/conf/Makefile.kern.inc | 4 ++++
2 files changed, 7 insertions(+), 2 deletions(-)
diffs (27 lines):
diff -r f46e67fb28dd -r cc50741b0aa4 tests/usr.bin/config/support/conf/Makefile
--- a/tests/usr.bin/config/support/conf/Makefile Sun Mar 15 22:59:39 2015 +0000
+++ b/tests/usr.bin/config/support/conf/Makefile Sun Mar 15 23:01:46 2015 +0000
@@ -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 @@
ATFFILE= no
FILESDIR= ${TESTSDIR}/support/conf
-FILES= files
+FILES= Makefile.kern.inc \
+ files
.include <bsd.test.mk>
.include <bsd.files.mk>
diff -r f46e67fb28dd -r cc50741b0aa4 tests/usr.bin/config/support/conf/Makefile.kern.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/usr.bin/config/support/conf/Makefile.kern.inc Sun Mar 15 23:01:46 2015 +0000
@@ -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
Home |
Main Index |
Thread Index |
Old Index