summaryrefslogtreecommitdiff
path: root/tests/dev
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2022-11-30 17:49:09 +0000
committermartin <martin@NetBSD.org>2022-11-30 17:49:09 +0000
commita151f7528f8a3d31f838ae96bd51ae2c6c467c44 (patch)
tree23ab27d96a71769f514d5f80f229a4f79c8bb019 /tests/dev
parent0be2937307e443611aa10effbc2e274d74bd05fd (diff)
Unfortunately rump does not provide the same magic as MAKEDEV does
for native /dev and create an alias for disk devices w/o partition latter pointing at the raw partition, so for rump based tests we actually have to calculate the concrete device name. Use an idiom suggested by kre for this which also works for ports that have kern.rawpartition > 4.
Diffstat (limited to 'tests/dev')
-rw-r--r--tests/dev/cgd/t_cgd.sh5
-rw-r--r--tests/dev/md/t_md.sh9
-rw-r--r--tests/dev/raidframe/t_raid.sh5
3 files changed, 9 insertions, 10 deletions
diff --git a/tests/dev/cgd/t_cgd.sh b/tests/dev/cgd/t_cgd.sh
index b1ff53d316e..56bbe048ef5 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.13 2019/04/10 06:13:21 kre Exp $
+# $NetBSD: t_cgd.sh,v 1.14 2022/11/30 17:49:09 martin Exp $
#
# Copyright (c) 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -25,7 +25,8 @@
# POSSIBILITY OF SUCH DAMAGE.
#
-rawpart=`sysctl -n kern.rawpartition | tr '01234' 'abcde'`
+rawpart=$( set -- a b c d e f g h i j k l m n o p q r s t u v w x y z;
+ shift $( sysctl -n kern.rawpartition ); printf %s "$1" )
rawcgd=/dev/rcgd0${rawpart}
cgdserver=\
"rump_server -lrumpvfs -lrumpkern_crypto -lrumpdev -lrumpdev_disk -lrumpdev_cgd"
diff --git a/tests/dev/md/t_md.sh b/tests/dev/md/t_md.sh
index 85de73e80b2..49c81c89bbb 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.7 2011/05/14 17:42:28 jmmv Exp $
+# $NetBSD: t_md.sh,v 1.8 2022/11/30 17:49:09 martin Exp $
#
# Copyright (c) 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -25,7 +25,8 @@
# POSSIBILITY OF SUCH DAMAGE.
#
-rawpart=`sysctl -n kern.rawpartition | tr '01234' 'abcde'`
+rawpart=$( set -- a b c d e f g h i j k l m n o p q r s t u v w x y z;
+ shift $( sysctl -n kern.rawpartition ); printf %s "$1" )
rawmd=/dev/rmd0${rawpart}
atf_test_case basic cleanup
@@ -38,10 +39,6 @@ basic_head()
basic_body()
{
- # Scope out raw part. This is actually the *host* raw partition,
- # but just let it slide for now, since they *should* be the same.
- rawpart=`sysctl -n kern.rawpartition | tr '01234' 'abcde'`
-
atf_check -s exit:0 $(atf_get_srcdir)/h_mdserv ${rawmd}
export RUMP_SERVER=unix://commsock
diff --git a/tests/dev/raidframe/t_raid.sh b/tests/dev/raidframe/t_raid.sh
index 52e38ff83b7..7f9d8bf04c1 100644
--- a/tests/dev/raidframe/t_raid.sh
+++ b/tests/dev/raidframe/t_raid.sh
@@ -1,5 +1,5 @@
#! /usr/bin/atf-sh
-# $NetBSD: t_raid.sh,v 1.15 2020/11/30 05:33:32 msaitoh Exp $
+# $NetBSD: t_raid.sh,v 1.16 2022/11/30 17:49:09 martin Exp $
#
# Copyright (c) 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -26,7 +26,8 @@
# POSSIBILITY OF SUCH DAMAGE.
#
-rawpart=`sysctl -n kern.rawpartition | tr '01234' 'abcde'`
+rawpart=$( set -- a b c d e f g h i j k l m n o p q r s t u v w x y z;
+ shift $( sysctl -n kern.rawpartition ); printf %s "$1" )
rawraid=/dev/rraid0${rawpart}
raidserver="rump_server -lrumpvfs -lrumpdev -lrumpdev_disk -lrumpdev_raidframe"