Check for RUMP programs before using them.

This commit is contained in:
joerg 2013-02-19 21:08:24 +00:00
parent 4a5bd22048
commit 94bcefa490
6 changed files with 21 additions and 6 deletions

View File

@ -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()

View File

@ -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()

View File

@ -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()

View File

@ -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} " "${@}" "; \

View File

@ -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 $@ ; \

View File

@ -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()