summaryrefslogtreecommitdiff
path: root/tests/dev
diff options
context:
space:
mode:
authorjmmv <jmmv@NetBSD.org>2011-05-14 17:42:28 +0000
committerjmmv <jmmv@NetBSD.org>2011-05-14 17:42:28 +0000
commit508796dde527067df112e40a0c88672fb2186bcb (patch)
tree1a33cb9c1189c24a9d71435effe5ebdbf5f1f393 /tests/dev
parent9b376794f1379545fca2c71b90341148ce334743 (diff)
Instead of doing 'atf_check ... sh -c foo', just do 'atf_check ... -x foo'.
Diffstat (limited to 'tests/dev')
-rw-r--r--tests/dev/cgd/t_cgd.sh16
-rw-r--r--tests/dev/md/t_md.sh6
-rw-r--r--tests/dev/raidframe/t_raid.sh6
3 files changed, 14 insertions, 14 deletions
diff --git a/tests/dev/cgd/t_cgd.sh b/tests/dev/cgd/t_cgd.sh
index 390087e8fa3..81fbf7c8f15 100644
--- a/tests/dev/cgd/t_cgd.sh
+++ b/tests/dev/cgd/t_cgd.sh
@@ -1,4 +1,4 @@
-# $NetBSD: t_cgd.sh,v 1.8 2011/03/22 16:16:30 jmmv Exp $
+# $NetBSD: t_cgd.sh,v 1.9 2011/05/14 17:42:28 jmmv Exp $
#
# Copyright (c) 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -45,9 +45,9 @@ basic_body()
${cgdserver} -d key=/dev/dk,hostpath=dk.img,size=1m unix://csock
export RUMP_SERVER=unix://csock
- atf_check -s exit:0 sh -c "echo 12345 | \
+ atf_check -s exit:0 -x "echo 12345 | \
rump.cgdconfig -p cgd0 /dev/dk ${d}/paramsfile"
- atf_check -s exit:0 -e ignore sh -c \
+ atf_check -s exit:0 -e ignore -x \
"dd if=${d}/t_cgd count=2 | rump.dd of=${rawcgd}"
atf_check -s exit:0 -e ignore dd if=${d}/t_cgd of=testfile count=2
atf_check -s exit:0 -e ignore -o file:testfile \
@@ -76,14 +76,14 @@ wrongpass_body()
${cgdserver} -d key=/dev/dk,hostpath=dk.img,size=1m unix://csock
export RUMP_SERVER=unix://csock
- atf_check -s exit:0 sh -c "echo 12345 | \
+ atf_check -s exit:0 -x "echo 12345 | \
rump.cgdconfig -p cgd0 /dev/dk ${d}/paramsfile"
- atf_check -s exit:0 -e ignore sh -c \
+ atf_check -s exit:0 -e ignore -x \
"dd if=${d}/t_cgd | rump.dd of=${rawcgd} count=2"
# unconfig and reconfig cgd
atf_check -s exit:0 rump.cgdconfig -u cgd0
- atf_check -s exit:0 sh -c "echo 54321 | \
+ atf_check -s exit:0 -x "echo 54321 | \
rump.cgdconfig -p cgd0 /dev/dk ${d}/paramsfile"
atf_check -s exit:0 -e ignore dd if=${d}/t_cgd of=testfile count=2
@@ -112,11 +112,11 @@ non512_body()
${cgdserver} -d key=/dev/dk,hostpath=dk.img,size=1m unix://csock
export RUMP_SERVER=unix://csock
- atf_check -s exit:0 sh -c "echo 12345 | \
+ atf_check -s exit:0 -x "echo 12345 | \
rump.cgdconfig -p cgd0 /dev/dk ${d}/paramsfile"
atf_expect_fail "PR kern/44515"
- atf_check -s exit:0 -e ignore sh -c \
+ atf_check -s exit:0 -e ignore -x \
"echo die hard | rump.dd of=${rawcgd} bs=123 conv=sync"
}
diff --git a/tests/dev/md/t_md.sh b/tests/dev/md/t_md.sh
index 62408349a7f..85de73e80b2 100644
--- a/tests/dev/md/t_md.sh
+++ b/tests/dev/md/t_md.sh
@@ -1,4 +1,4 @@
-# $NetBSD: t_md.sh,v 1.6 2011/02/04 19:44:00 pooka Exp $
+# $NetBSD: t_md.sh,v 1.7 2011/05/14 17:42:28 jmmv Exp $
#
# Copyright (c) 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -45,9 +45,9 @@ basic_body()
atf_check -s exit:0 $(atf_get_srcdir)/h_mdserv ${rawmd}
export RUMP_SERVER=unix://commsock
- atf_check -s exit:0 -e ignore sh -c \
+ atf_check -s exit:0 -e ignore -x \
"dd if=/bin/ls count=10 | rump.dd of=${rawmd} seek=100"
- atf_check -s exit:0 -e ignore sh -c \
+ atf_check -s exit:0 -e ignore -x \
"rump.dd if=${rawmd} skip=100 count=10 | dd of=testfile"
atf_check -s exit:0 -e ignore -o file:testfile dd if=/bin/ls count=10
}
diff --git a/tests/dev/raidframe/t_raid.sh b/tests/dev/raidframe/t_raid.sh
index 0380e1c9d8d..09d091df36f 100644
--- a/tests/dev/raidframe/t_raid.sh
+++ b/tests/dev/raidframe/t_raid.sh
@@ -1,4 +1,4 @@
-# $NetBSD: t_raid.sh,v 1.7 2011/03/01 22:52:54 riz Exp $
+# $NetBSD: t_raid.sh,v 1.8 2011/05/14 17:42:28 jmmv Exp $
#
# Copyright (c) 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -96,7 +96,7 @@ raid1_compfail_body()
# put some data there
atf_check -s exit:0 -e ignore \
dd if=$(atf_get_srcdir)/t_raid of=testfile count=4
- atf_check -s exit:0 -e ignore sh -c \
+ atf_check -s exit:0 -e ignore -x \
"dd if=testfile | rump.dd of=${rawraid} conv=sync"
# restart server with failed component
@@ -183,7 +183,7 @@ raid5_compfail_body()
# put some data there
atf_check -s exit:0 -e ignore \
dd if=$(atf_get_srcdir)/t_raid of=testfile count=4
- atf_check -s exit:0 -e ignore sh -c \
+ atf_check -s exit:0 -e ignore -x \
"dd if=testfile | rump.dd of=${rawraid} conv=sync"
# restart server with failed component