Module Name: src
Committed By: martin
Date: Sat Sep 11 16:03:41 UTC 2010
Modified Files:
src/tests/dev/scsipi: Makefile t_cd.c
Log Message:
Query the raw partition at runtime
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/dev/scsipi/Makefile
cvs rdiff -u -r1.1 -r1.2 src/tests/dev/scsipi/t_cd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/dev/scsipi/Makefile
diff -u src/tests/dev/scsipi/Makefile:1.2 src/tests/dev/scsipi/Makefile:1.3
--- src/tests/dev/scsipi/Makefile:1.2 Thu Sep 2 16:55:15 2010
+++ src/tests/dev/scsipi/Makefile Sat Sep 11 16:03:41 2010
@@ -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
Index: src/tests/dev/scsipi/t_cd.c
diff -u src/tests/dev/scsipi/t_cd.c:1.1 src/tests/dev/scsipi/t_cd.c:1.2
--- src/tests/dev/scsipi/t_cd.c:1.1 Tue Aug 24 11:29:45 2010
+++ src/tests/dev/scsipi/t_cd.c Sat Sep 11 16:03:41 2010
@@ -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);
