Module Name: src Committed By: gson Date: Tue Jan 7 16:47:13 UTC 2014
Modified Files: src/distrib/sets/lists/tests: mi src/etc/mtree: NetBSD.dist.tests src/tests/usr.bin: Makefile Added Files: src/tests/usr.bin/vmstat: Makefile t_vmstat.sh Log Message: Add some minimal tests of vmstat(1), to serve as regression tests for PR bin/44518. To generate a diff of this commit: cvs rdiff -u -r1.554 -r1.555 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.98 -r1.99 src/etc/mtree/NetBSD.dist.tests cvs rdiff -u -r1.18 -r1.19 src/tests/usr.bin/Makefile cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/vmstat/Makefile \ src/tests/usr.bin/vmstat/t_vmstat.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.554 src/distrib/sets/lists/tests/mi:1.555 --- src/distrib/sets/lists/tests/mi:1.554 Mon Jan 6 14:50:32 2014 +++ src/distrib/sets/lists/tests/mi Tue Jan 7 16:47:13 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.554 2014/01/06 14:50:32 gson Exp $ +# $NetBSD: mi,v 1.555 2014/01/07 16:47:13 gson Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -3065,6 +3065,9 @@ ./usr/tests/usr.bin/unifdef/d_basic.in tests-usr.bin-tests atf ./usr/tests/usr.bin/unifdef/d_basic.out tests-usr.bin-tests atf ./usr/tests/usr.bin/unifdef/t_basic tests-usr.bin-tests atf +./usr/tests/usr.bin/vmstat tests-usr.bin-tests +./usr/tests/usr.bin/vmstat/Atffile tests-usr.bin-tests atf +./usr/tests/usr.bin/vmstat/t_vmstat tests-usr.bin-tests atf ./usr/tests/usr.bin/xlint tests-usr.bin-tests ./usr/tests/usr.bin/xlint/Atffile tests-usr.bin-tests atf ./usr/tests/usr.bin/xlint/Kyuafile tests-usr.bin-tests atf,kyua Index: src/etc/mtree/NetBSD.dist.tests diff -u src/etc/mtree/NetBSD.dist.tests:1.98 src/etc/mtree/NetBSD.dist.tests:1.99 --- src/etc/mtree/NetBSD.dist.tests:1.98 Sun Aug 11 03:53:12 2013 +++ src/etc/mtree/NetBSD.dist.tests Tue Jan 7 16:47:13 2014 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.tests,v 1.98 2013/08/11 03:53:12 dholland Exp $ +# $NetBSD: NetBSD.dist.tests,v 1.99 2014/01/07 16:47:13 gson Exp $ ./usr/libdata/debug/usr/tests ./usr/libdata/debug/usr/tests/atf @@ -363,6 +363,7 @@ ./usr/tests/usr.bin/tmux ./usr/tests/usr.bin/tr ./usr/tests/usr.bin/unifdef +./usr/tests/usr.bin/vmstat ./usr/tests/usr.bin/xlint ./usr/tests/usr.bin/xlint/lint1 ./usr/tests/usr.sbin Index: src/tests/usr.bin/Makefile diff -u src/tests/usr.bin/Makefile:1.18 src/tests/usr.bin/Makefile:1.19 --- src/tests/usr.bin/Makefile:1.18 Sat Aug 10 22:36:16 2013 +++ src/tests/usr.bin/Makefile Tue Jan 7 16:47:13 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2013/08/10 22:36:16 dholland Exp $ +# $NetBSD: Makefile,v 1.19 2014/01/07 16:47:13 gson Exp $ # .include <bsd.own.mk> @@ -8,6 +8,6 @@ TESTSDIR= ${TESTSBASE}/usr.bin TESTS_SUBDIRS= awk basename bzip2 cc cmp config cut \ diff dirname find grep gzip id infocmp jot m4 make mkdep \ nbperf netpgpverify pr rump_server shmif_dumpbus sdiff \ - sed sort tmux tr unifdef xlint + sed sort tmux tr unifdef vmstat xlint .include <bsd.test.mk> Added files: Index: src/tests/usr.bin/vmstat/Makefile diff -u /dev/null src/tests/usr.bin/vmstat/Makefile:1.1 --- /dev/null Tue Jan 7 16:47:13 2014 +++ src/tests/usr.bin/vmstat/Makefile Tue Jan 7 16:47:13 2014 @@ -0,0 +1,8 @@ +# $NetBSD: Makefile,v 1.1 2014/01/07 16:47:13 gson Exp $ + +.include <bsd.own.mk> + +TESTSDIR= ${TESTSBASE}/usr.bin/vmstat +TESTS_SH= t_vmstat + +.include <bsd.test.mk> Index: src/tests/usr.bin/vmstat/t_vmstat.sh diff -u /dev/null src/tests/usr.bin/vmstat/t_vmstat.sh:1.1 --- /dev/null Tue Jan 7 16:47:13 2014 +++ src/tests/usr.bin/vmstat/t_vmstat.sh Tue Jan 7 16:47:13 2014 @@ -0,0 +1,48 @@ +# $NetBSD: t_vmstat.sh,v 1.1 2014/01/07 16:47:13 gson Exp $ +# +# Copyright (c) 2013 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. +# + +atf_test_case default +default_head() { + atf_set "descr" "Test that vmstat(1) returns success when run with no arguments" +} +default_body() { + atf_check -s exit:0 -o ignore -e empty vmstat +} + +atf_test_case opt_s +opt_s_head() { + atf_set "descr" "Test that vmstat(1) returns success when run with -s (PR 44518)" +} +opt_s_body() { + atf_check -s exit:0 -o ignore -e empty vmstat -s +} + +atf_init_test_cases() +{ + atf_add_test_case default + atf_add_test_case opt_s +}