[src/trunk]: src/tests/dev/scsipi Query the raw partition at runtime

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

details:   https://anonhg.NetBSD.org/src/rev/d65d7216e143
branches:  trunk
changeset: 757675:d65d7216e143
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Sep 11 16:03:41 2010 +0000

description:
Query the raw partition at runtime

diffstat:

 tests/dev/scsipi/Makefile |  4 ++--
 tests/dev/scsipi/t_cd.c   |  7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diffs (49 lines):

diff -r 50c80f1a78aa -r d65d7216e143 tests/dev/scsipi/Makefile
--- a/tests/dev/scsipi/Makefile Sat Sep 11 13:06:36 2010 +0000
+++ b/tests/dev/scsipi/Makefile Sat Sep 11 16:03:41 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2010/09/02 16:55:15 he Exp $
+#      $NetBSD: Makefile,v 1.3 2010/09/11 16:03:41 martin Exp $
 #
 
 .include <bsd.own.mk>
@@ -8,7 +8,7 @@
 TESTS_C=       t_cd
 
 LDADD+=        -lrumpdev_scsitest -lrumpdev_scsipi -lrumpdev_disk -lrumpdev -lrumpvfs
-LDADD+=        -lrump
+LDADD+=        -lrump -lutil
 LDADD+=        -lrumpuser -lpthread
 
 WARNS= 4
diff -r 50c80f1a78aa -r d65d7216e143 tests/dev/scsipi/t_cd.c
--- a/tests/dev/scsipi/t_cd.c   Sat Sep 11 13:06:36 2010 +0000
+++ b/tests/dev/scsipi/t_cd.c   Sat Sep 11 16:03:41 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: t_cd.c,v 1.1 2010/08/24 11:29:45 pooka Exp $   */
+/*     $NetBSD: t_cd.c,v 1.2 2010/09/11 16:03:41 martin Exp $  */
 
 /*
  * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
@@ -31,6 +31,7 @@
 #include <atf-c.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <util.h>
 
 #include <rump/rump.h>
 #include <rump/rump_syscalls.h>
@@ -48,10 +49,12 @@
 
 ATF_TC_BODY(noisyeject, tc)
 {
+       static char fname[] = "/dev/rcd0_";
        int fd, arg = 0;
 
+       fname[strlen(fname)-1] = 'a' + getrawpartition();
        rump_init();
-       RL(fd = rump_sys_open("/dev/rcd0d", O_RDWR));
+       RL(fd = rump_sys_open(fname, O_RDWR));
        RL(rump_sys_ioctl(fd, DIOCEJECT, &arg));
 
        ATF_REQUIRE_EQ(rump_scsitest_err[RUMP_SCSITEST_NOISYSYNC], 0);