[src/trunk]: src/tests/dev Unfortunately rump does not provide the same magic...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5e72e0f83391
branches:  trunk
changeset: 372469:5e72e0f83391
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Nov 30 17:49:09 2022 +0000

description:
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:

 tests/dev/cgd/t_cgd.sh        |  5 +++--
 tests/dev/md/t_md.sh          |  9 +++------
 tests/dev/raidframe/t_raid.sh |  5 +++--
 3 files changed, 9 insertions(+), 10 deletions(-)

diffs (69 lines):

diff -r 79936df177eb -r 5e72e0f83391 tests/dev/cgd/t_cgd.sh
--- a/tests/dev/cgd/t_cgd.sh    Wed Nov 30 17:42:20 2022 +0000
+++ b/tests/dev/cgd/t_cgd.sh    Wed Nov 30 17:49:09 2022 +0000
@@ -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 -r 79936df177eb -r 5e72e0f83391 tests/dev/md/t_md.sh
--- a/tests/dev/md/t_md.sh      Wed Nov 30 17:42:20 2022 +0000
+++ b/tests/dev/md/t_md.sh      Wed Nov 30 17:49:09 2022 +0000
@@ -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_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 -r 79936df177eb -r 5e72e0f83391 tests/dev/raidframe/t_raid.sh
--- a/tests/dev/raidframe/t_raid.sh     Wed Nov 30 17:42:20 2022 +0000
+++ b/tests/dev/raidframe/t_raid.sh     Wed Nov 30 17:49:09 2022 +0000
@@ -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"