Module Name:    src
Committed By:   jmmv
Date:           Sat Nov 12 01:19:25 UTC 2011

Modified Files:
        src/tests: Makefile
Added Files:
        src/tests/examples: Makefile t_asm.sh

Log Message:
Add tests to ensure that the new asm examples build and run, just as the
end-user is supposed to work with them.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/tests/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/examples/Makefile \
    src/tests/examples/t_asm.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/Makefile
diff -u src/tests/Makefile:1.33 src/tests/Makefile:1.34
--- src/tests/Makefile:1.33	Wed Sep 21 02:14:38 2011
+++ src/tests/Makefile	Sat Nov 12 01:19:25 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2011/09/21 02:14:38 mrg Exp $
+# $NetBSD: Makefile,v 1.34 2011/11/12 01:19:25 jmmv Exp $
 
 .include <bsd.own.mk>
 
@@ -7,7 +7,7 @@
 TESTSDIR=	${TESTSBASE}
 ATFFILE=	yes
 
-SUBDIR=		dev fs games include ipf kernel lib libexec net
+SUBDIR=		dev examples fs games include ipf kernel lib libexec net
 SUBDIR+=	rump sbin sys toolchain usr.bin usr.sbin util
 
 . if ${MKKMOD} != "no"

Added files:

Index: src/tests/examples/Makefile
diff -u /dev/null src/tests/examples/Makefile:1.1
--- /dev/null	Sat Nov 12 01:19:25 2011
+++ src/tests/examples/Makefile	Sat Nov 12 01:19:25 2011
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile,v 1.1 2011/11/12 01:19:25 jmmv Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/examples
+
+TESTS_SH=	t_asm
+
+.include <bsd.test.mk>
Index: src/tests/examples/t_asm.sh
diff -u /dev/null src/tests/examples/t_asm.sh:1.1
--- /dev/null	Sat Nov 12 01:19:25 2011
+++ src/tests/examples/t_asm.sh	Sat Nov 12 01:19:25 2011
@@ -0,0 +1,74 @@
+# $NetBSD: t_asm.sh,v 1.1 2011/11/12 01:19:25 jmmv Exp $
+#
+# Copyright (c) 2011 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.
+#
+
+# check_implemented <example_name>
+#
+# Verifies if a particular asm example is implemented for the current
+# platform.  The example_name argument is the name of the subdirectory
+# of the examples/asm/ subtree that includes the code for the example
+# under test.
+#
+# If the example is not implemented, the calling test is skipped.  If the
+# check for implementation fails, the calling test is failed.
+check_implemented() {
+	local name="${1}"; shift
+
+	local implemented=$(cd /usr/share/examples/asm/${name}/ && \
+	                    make check-implemented)
+	[ $? -eq 0 ] || atf_fail "Failed to determine if the sample" \
+	    "program is supported"
+	[ "${implemented}" = yes ] || atf_skip "Example program not" \
+	    "implemented on this platform"
+}
+
+# copy_example <example_name>
+#
+# Copies the example code and supporting Makefiles into the current
+# directory.
+copy_example() {
+	local name="${1}"; shift
+
+	cp /usr/share/examples/asm/${name}/* .
+}
+
+atf_test_case hello
+hello_head() {
+	atf_set "descr" "Builds, runs and validates the 'hello' asm example"
+	atf_set "require.files" "/usr/share/examples/asm/hello/"
+	atf_set "require.progs" "make"
+}
+hello_body() {
+	check_implemented hello
+	copy_example hello
+	atf_check -s exit:0 -o ignore -e ignore make
+	atf_check -s exit:0 -o inline:'Hello, world!\n' -e empty ./hello
+}
+
+atf_init_test_cases() {
+	atf_add_test_case hello
+}

Reply via email to