Module Name: src
Committed By: jmmv
Date: Sat Jul 10 16:24:12 UTC 2010
Modified Files:
src/tests/util/config: Makefile
Added Files:
src/tests/util/config: t_config.sh
Removed Files:
src/tests/util/config: t_config.awk t_config.in
Log Message:
Do not use awk to generate the test program. Instead, replace it with some
eval magic (which is less magic than the previous awk stuff).
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/util/config/Makefile
cvs rdiff -u -r1.2 -r0 src/tests/util/config/t_config.awk
cvs rdiff -u -r1.1 -r0 src/tests/util/config/t_config.in
cvs rdiff -u -r0 -r1.1 src/tests/util/config/t_config.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/config/Makefile
diff -u src/tests/util/config/Makefile:1.1 src/tests/util/config/Makefile:1.2
--- src/tests/util/config/Makefile:1.1 Fri Feb 13 05:19:51 2009
+++ src/tests/util/config/Makefile Sat Jul 10 16:24:12 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/02/13 05:19:51 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/07/10 16:24:12 jmmv Exp $
SUBDIR= support
@@ -10,11 +10,6 @@
TESTS_SH= t_config
-CLEANFILES+= t_config.sh
-t_config.sh: t_config.awk t_config.in
- ${TOOL_AWK} -f ${.CURDIR}/t_config.awk ${.CURDIR}/t_config.in >t_config.sh.tmp
- mv t_config.sh.tmp t_config.sh
-
FILESDIR= ${TESTSDIR}
FILES= d_deffs_redef
FILES+= d_loop
Added files:
Index: src/tests/util/config/t_config.sh
diff -u /dev/null src/tests/util/config/t_config.sh:1.1
--- /dev/null Sat Jul 10 16:24:12 2010
+++ src/tests/util/config/t_config.sh Sat Jul 10 16:24:12 2010
@@ -0,0 +1,91 @@
+# $NetBSD: t_config.sh,v 1.1 2010/07/10 16:24:12 jmmv Exp $
+#
+# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+run_and_check_pass()
+{
+ local name="${1}"; shift
+
+ mkdir compile
+ supportdir="$(atf_get_srcdir)/support"
+ config="$(atf_get_srcdir)/d_${name}"
+
+ atf_check -o ignore \
+ config -s "${supportdir}" -b "compile/${name}" "${config}"
+}
+
+run_and_check_fail()
+{
+ local name="${1}"; shift
+
+ mkdir compile
+ supportdir="$(atf_get_srcdir)/support"
+ config="$(atf_get_srcdir)/d_${name}"
+
+ atf_check -o ignore -e ignore -s ne:0 \
+ config -s "${supportdir}" -b "compile/${name}" "${config}"
+}
+
+# Defines a test case for config(1).
+test_case()
+{
+ local name="${1}"; shift
+ local type="${1}"; shift
+ local descr="${*}"
+
+ atf_test_case "${name}"
+ eval "${name}_head() { \
+ atf_set descr \"${descr}\"; \
+ atf_set use.fs true; \
+ }"
+ eval "${name}_body() { \
+ run_and_check_${type} '${name}'; \
+ }"
+}
+
+test_case shadow_instance pass "Checks correct handling of shadowed instances"
+test_case loop pass "Checks correct handling of loops"
+test_case loop2 pass "Checks correct handling of devices that can be their" \
+ "own parents"
+test_case pseudo_parent pass "Checks correct handling of children of pseudo" \
+ "devices (PR/32329)"
+test_case postponed_orphan fail "Checks that config catches adding an" \
+ "instance of a child of a negated instance as error"
+test_case no_pseudo fail "Checks that config catches ommited 'pseudo-device'" \
+ "as error (PR/34111)"
+test_case deffs_redef fail "Checks that config doesn't allow a deffs to use" \
+ "the same name as a previous defflag/defparam"
+
+atf_init_test_cases()
+{
+ atf_add_test_case shadow_instance
+ atf_add_test_case loop
+ atf_add_test_case loop2
+ atf_add_test_case pseudo_parent
+ atf_add_test_case postponed_orphan
+ atf_add_test_case no_pseudo
+ atf_add_test_case deffs_redef
+}
