Module Name: src
Committed By: joerg
Date: Tue Feb 19 21:08:26 UTC 2013
Modified Files:
src/tests/dev/cgd: t_cgd.sh
src/tests/dev/raidframe: t_raid.sh
src/tests/net/route: t_change.sh
src/tests/sbin/resize_ffs: common.sh
src/tests/usr.bin/rump_server: t_disk.sh
src/tests/usr.sbin/traceroute: t_traceroute.sh
Log Message:
Check for RUMP programs before using them.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/tests/dev/cgd/t_cgd.sh
cvs rdiff -u -r1.11 -r1.12 src/tests/dev/raidframe/t_raid.sh
cvs rdiff -u -r1.3 -r1.4 src/tests/net/route/t_change.sh
cvs rdiff -u -r1.12 -r1.13 src/tests/sbin/resize_ffs/common.sh
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/rump_server/t_disk.sh
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.sbin/traceroute/t_traceroute.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/dev/cgd/t_cgd.sh
diff -u src/tests/dev/cgd/t_cgd.sh:1.10 src/tests/dev/cgd/t_cgd.sh:1.11
--- src/tests/dev/cgd/t_cgd.sh:1.10 Thu May 19 20:37:50 2011
+++ src/tests/dev/cgd/t_cgd.sh Tue Feb 19 21:08:24 2013
@@ -1,4 +1,4 @@
-# $NetBSD: t_cgd.sh,v 1.10 2011/05/19 20:37:50 riastradh Exp $
+# $NetBSD: t_cgd.sh,v 1.11 2013/02/19 21:08:24 joerg Exp $
#
# Copyright (c) 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -35,6 +35,7 @@ basic_head()
{
atf_set "descr" "Tests that encrypt/decrypt works"
+ atf_set "require.progs" "rump_server"
}
basic_body()
@@ -66,6 +67,7 @@ wrongpass_head()
atf_set "descr" "Tests that wrong password does not give original " \
"plaintext"
+ atf_set "require.progs" "rump_server"
}
wrongpass_body()
@@ -103,6 +105,7 @@ unaligned_write_head()
{
atf_set "descr" "Attempt unaligned writes to a raw cgd device"
+ atf_set "require.progs" "rump_server"
}
unaligned_write_body()
Index: src/tests/dev/raidframe/t_raid.sh
diff -u src/tests/dev/raidframe/t_raid.sh:1.11 src/tests/dev/raidframe/t_raid.sh:1.12
--- src/tests/dev/raidframe/t_raid.sh:1.11 Sat Oct 15 11:31:40 2011
+++ src/tests/dev/raidframe/t_raid.sh Tue Feb 19 21:08:24 2013
@@ -1,5 +1,5 @@
#! /usr/bin/atf-sh
-# $NetBSD: t_raid.sh,v 1.11 2011/10/15 11:31:40 gson Exp $
+# $NetBSD: t_raid.sh,v 1.12 2013/02/19 21:08:24 joerg Exp $
#
# Copyright (c) 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -51,6 +51,7 @@ smalldisk_head()
{
atf_set "descr" "Checks the raidframe works on small disks " \
"(PR kern/44239)"
+ atf_set "require.progs" "rump_server"
}
smalldisk_body()
@@ -79,6 +80,7 @@ atf_test_case raid1_compfail cleanup
raid1_compfail_head()
{
atf_set "descr" "Checks that RAID1 works after component failure"
+ atf_set "require.progs" "rump_server"
}
raid1_compfail_body()
@@ -128,6 +130,7 @@ raid1_comp0fail_head()
{
atf_set "descr" "Checks configuring RAID1 after component 0 fails" \
"(PR kern/44251)"
+ atf_set "require.progs" "rump_server"
}
raid1_comp0fail_body()
@@ -165,6 +168,7 @@ raid1_normal_head()
{
atf_set "descr" "Checks that RAID1 -c configurations work " \
"in the normal case"
+ atf_set "require.progs" "rump_server"
}
raid1_normal_body()
@@ -213,6 +217,7 @@ atf_test_case raid5_compfail cleanup
raid5_compfail_head()
{
atf_set "descr" "Checks that RAID5 works after component failure"
+ atf_set "require.progs" "rump_server"
}
raid5_compfail_body()
@@ -262,6 +267,7 @@ raid5_normal_head()
{
atf_set "descr" "Checks that RAID5 works after normal shutdown " \
"and 'raidctl -c' startup"
+ atf_set "require.progs" "rump_server"
}
raid5_normal_body()
Index: src/tests/net/route/t_change.sh
diff -u src/tests/net/route/t_change.sh:1.3 src/tests/net/route/t_change.sh:1.4
--- src/tests/net/route/t_change.sh:1.3 Sat May 14 17:42:28 2011
+++ src/tests/net/route/t_change.sh Tue Feb 19 21:08:25 2013
@@ -1,4 +1,4 @@
-# $NetBSD: t_change.sh,v 1.3 2011/05/14 17:42:28 jmmv Exp $
+# $NetBSD: t_change.sh,v 1.4 2013/02/19 21:08:25 joerg Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -34,6 +34,7 @@ reject2blackhole_head()
{
atf_set "descr" "Change a reject route to blackhole"
+ atf_set "require.progs" "rump_server"
}
reject2blackhole_body()
Index: src/tests/sbin/resize_ffs/common.sh
diff -u src/tests/sbin/resize_ffs/common.sh:1.12 src/tests/sbin/resize_ffs/common.sh:1.13
--- src/tests/sbin/resize_ffs/common.sh:1.12 Tue May 17 22:01:41 2011
+++ src/tests/sbin/resize_ffs/common.sh Tue Feb 19 21:08:25 2013
@@ -26,6 +26,7 @@ test_case()
atf_test_case "${name}" cleanup
eval "${name}_head() { \
atf_set "require.user" "root" ; \
+ atf_set "require.progs" "rump_ffs" ; \
}"
eval "${name}_body() { \
${check_function} " "${@}" "; \
Index: src/tests/usr.bin/rump_server/t_disk.sh
diff -u src/tests/usr.bin/rump_server/t_disk.sh:1.4 src/tests/usr.bin/rump_server/t_disk.sh:1.5
--- src/tests/usr.bin/rump_server/t_disk.sh:1.4 Sat May 14 17:42:28 2011
+++ src/tests/usr.bin/rump_server/t_disk.sh Tue Feb 19 21:08:25 2013
@@ -1,4 +1,4 @@
-# $NetBSD: t_disk.sh,v 1.4 2011/05/14 17:42:28 jmmv Exp $
+# $NetBSD: t_disk.sh,v 1.5 2013/02/19 21:08:25 joerg Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -39,7 +39,9 @@ test_case()
local name="${1}"; shift
atf_test_case "${name}" cleanup
- eval "${name}_head() { }"
+ eval "${name}_head() { \
+ atf_set "require.progs" "rump_server" ; \
+ }"
eval "${name}_body() { \
${name}_prefun ; \
startsrv $@ ; \
Index: src/tests/usr.sbin/traceroute/t_traceroute.sh
diff -u src/tests/usr.sbin/traceroute/t_traceroute.sh:1.4 src/tests/usr.sbin/traceroute/t_traceroute.sh:1.5
--- src/tests/usr.sbin/traceroute/t_traceroute.sh:1.4 Fri Dec 31 15:21:49 2010
+++ src/tests/usr.sbin/traceroute/t_traceroute.sh Tue Feb 19 21:08:25 2013
@@ -1,4 +1,4 @@
-# $NetBSD: t_traceroute.sh,v 1.4 2010/12/31 15:21:49 pooka Exp $
+# $NetBSD: t_traceroute.sh,v 1.5 2013/02/19 21:08:25 joerg Exp $
#
# Copyright (c) 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -33,6 +33,7 @@ basic_head()
{
atf_set "descr" "Does a simple three-hop traceroute"
+ atf_set "require.progs" "rump_server"
}
cfgendpt ()
@@ -106,6 +107,7 @@ basic_icmp_head()
{
atf_set "descr" "Does an ICMP-based three-hop traceroute"
+ atf_set "require.progs" "rump_server"
}
basic_icmp_body()
