Module Name:    src
Committed By:   uebayasi
Date:           Fri Oct 31 09:11:42 UTC 2014

Modified Files:
        src/tests/usr.bin/config: t_config.sh
        src/tests/usr.bin/config/support/conf: files

Log Message:
config(1): Briefly test ioconf.c output


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/config/t_config.sh
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/config/support/conf/files

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/t_config.sh
diff -u src/tests/usr.bin/config/t_config.sh:1.4 src/tests/usr.bin/config/t_config.sh:1.5
--- src/tests/usr.bin/config/t_config.sh:1.4	Fri Oct 31 07:38:36 2014
+++ src/tests/usr.bin/config/t_config.sh	Fri Oct 31 09:11:42 2014
@@ -1,4 +1,4 @@
-# $NetBSD: t_config.sh,v 1.4 2014/10/31 07:38:36 uebayasi Exp $
+# $NetBSD: t_config.sh,v 1.5 2014/10/31 09:11:42 uebayasi Exp $
 #
 # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -166,6 +166,31 @@ no_select_body() {
 	test_output no_select
 }
 
+# Device instance
+test_case devi pass "Device instance"
+devi_config_str='
+include "../d_min"
+d0 at root
+'
+check_devi()
+{
+	local f=ioconf.c
+
+	sed -ne '/^struct cfdriver \* const cfdriver_list_initial\[\]/,/^};/p' $f >tmp.cfdriver
+	sed -ne '/^struct cfdata cfdata\[\]/,/^};/p' $f >tmp.cfdata
+
+	grep -q '^CFDRIVER_DECL(d, ' $f &&
+	grep -q '&d_cd,' tmp.cfdriver &&
+	grep -q '^extern struct cfattach d_ca;$' $f &&
+	grep -q '^static const struct cfiattrdata \* const d_attrs\[\]' $f &&
+	grep -q '^static const struct cfiattrdata icf_iattrdata' $f &&
+	grep -q '{ "d",' tmp.cfdata &&
+	:
+}
+devi_body() {
+	test_output devi
+}
+
 # Check minimal kernel config(1) output
 test_case min pass "Minimal config"
 check_min_files()
@@ -217,5 +242,6 @@ atf_init_test_cases()
 	atf_add_test_case no_undefined_opt
 	atf_add_test_case select
 	atf_add_test_case no_select
+	atf_add_test_case devi
 	atf_add_test_case min
 }

Index: src/tests/usr.bin/config/support/conf/files
diff -u src/tests/usr.bin/config/support/conf/files:1.2 src/tests/usr.bin/config/support/conf/files:1.3
--- src/tests/usr.bin/config/support/conf/files:1.2	Fri Oct 31 07:38:36 2014
+++ src/tests/usr.bin/config/support/conf/files	Fri Oct 31 09:11:42 2014
@@ -33,3 +33,9 @@ file	b.c	b
 
 define	c: b
 file	c.c	c
+
+define	i {}
+
+device	d: i
+attach	d at root
+file	d.c	d

Reply via email to