From 0159a35e80faa75608b4f3331587a13aff88a8f2 Mon Sep 17 00:00:00 2001
From: pooka <pooka@NetBSD.org>
Date: Fri, 25 Apr 2014 00:24:39 +0000
Subject: [PATCH] obsolete the installed <rump/scsitest.h> header and make it
 private to tests/dev/scsipi

---
 distrib/sets/lists/comp/mi                                 | 4 ++--
 sys/rump/include/rump/Makefile                             | 4 +---
 tests/dev/scsipi/Makefile                                  | 4 +++-
 tests/dev/scsipi/libscsitest/scsitest.c                    | 7 ++++---
 .../rump => tests/dev/scsipi/libscsitest}/scsitest.h       | 2 +-
 tests/dev/scsipi/t_cd.c                                    | 5 +++--
 6 files changed, 14 insertions(+), 12 deletions(-)
 rename {sys/rump/include/rump => tests/dev/scsipi/libscsitest}/scsitest.h (96%)

diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index fee1752e99ea..d45a8f670f20 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1890 2014/04/24 21:46:44 pooka Exp $
+#	$NetBSD: mi,v 1.1891 2014/04/25 00:24:39 pooka Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -3058,7 +3058,7 @@
 ./usr/include/rump/rumpuser_port.h			comp-c-include	rump
 ./usr/include/rump/rumpvfs_if_pub.h		comp-c-include	rump
 ./usr/include/rump/rumpvnode_if.h		comp-c-include	rump
-./usr/include/rump/scsitest.h			comp-c-include	rump
+./usr/include/rump/scsitest.h			comp-obsolete obsolete
 ./usr/include/rump/ukfs.h			comp-c-include	rump
 ./usr/include/sa.h				comp-obsolete		obsolete
 ./usr/include/saslc.h				comp-c-include		crypto
diff --git a/sys/rump/include/rump/Makefile b/sys/rump/include/rump/Makefile
index 5bb3bed55937..fd80f2a462f7 100644
--- a/sys/rump/include/rump/Makefile
+++ b/sys/rump/include/rump/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2013/12/18 20:14:02 pooka Exp $
+#	$NetBSD: Makefile,v 1.7 2014/04/25 00:24:39 pooka Exp $
 
 .include <bsd.own.mk>
 
@@ -9,8 +9,6 @@ INCS=		rump.h rump_namei.h rump_syscalls.h rump_syscalls_compat.h
 INCS+=		rumpdefs.h rumperr.h rumpuser.h rumpvnode_if.h
 
 INCS+=		rumpkern_if_pub.h rumpvfs_if_pub.h rumpnet_if_pub.h
-
-INCS+=		scsitest.h
 .endif
 
 .include <bsd.kinc.mk>
diff --git a/tests/dev/scsipi/Makefile b/tests/dev/scsipi/Makefile
index d094a3888ff8..1980ef749bd6 100644
--- a/tests/dev/scsipi/Makefile
+++ b/tests/dev/scsipi/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2014/04/24 21:46:44 pooka Exp $
+#	$NetBSD: Makefile,v 1.5 2014/04/25 00:24:39 pooka Exp $
 #
 
 .include <bsd.own.mk>
@@ -7,6 +7,8 @@ TESTSDIR=	${TESTSBASE}/dev/scsipi
 
 TESTS_C=	t_cd
 
+CPPFLAGS+=	-I${.CURDIR}/libscsitest
+
 # kernel component required by test
 SUBDIR=	libscsitest
 SCSITESTDIR!= cd ${.CURDIR}/libscsitest && ${PRINTOBJDIR}
diff --git a/tests/dev/scsipi/libscsitest/scsitest.c b/tests/dev/scsipi/libscsitest/scsitest.c
index 2b26fe24d354..8f214f783d8c 100644
--- a/tests/dev/scsipi/libscsitest/scsitest.c
+++ b/tests/dev/scsipi/libscsitest/scsitest.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: scsitest.c,v 1.1 2014/04/24 21:46:44 pooka Exp $	*/
+/*	$NetBSD: scsitest.c,v 1.2 2014/04/25 00:24:39 pooka Exp $	*/
 
 /*
  * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsitest.c,v 1.1 2014/04/24 21:46:44 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsitest.c,v 1.2 2014/04/25 00:24:39 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/atomic.h>
@@ -51,7 +51,8 @@ __KERNEL_RCSID(0, "$NetBSD: scsitest.c,v 1.1 2014/04/24 21:46:44 pooka Exp $");
 #include <dev/scsipi/scsipi_all.h>
 
 #include <rump/rumpuser.h>
-#include <rump/scsitest.h>
+
+#include "scsitest.h"
 
 int	scsitest_match(device_t, cfdata_t, void *);
 void	scsitest_attach(device_t, device_t, void *);
diff --git a/sys/rump/include/rump/scsitest.h b/tests/dev/scsipi/libscsitest/scsitest.h
similarity index 96%
rename from sys/rump/include/rump/scsitest.h
rename to tests/dev/scsipi/libscsitest/scsitest.h
index b761b5e6a84c..ba9b84a3f598 100644
--- a/sys/rump/include/rump/scsitest.h
+++ b/tests/dev/scsipi/libscsitest/scsitest.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: scsitest.h,v 1.1 2010/08/24 13:19:04 pooka Exp $	*/
+/*	$NetBSD: scsitest.h,v 1.1 2014/04/25 00:24:39 pooka Exp $	*/
 
 /*
  * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
diff --git a/tests/dev/scsipi/t_cd.c b/tests/dev/scsipi/t_cd.c
index 8a1c0bf62e50..58e61a564ea0 100644
--- a/tests/dev/scsipi/t_cd.c
+++ b/tests/dev/scsipi/t_cd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_cd.c,v 1.6 2013/03/15 16:18:49 martin Exp $	*/
+/*	$NetBSD: t_cd.c,v 1.7 2014/04/25 00:24:39 pooka Exp $	*/
 
 /*
  * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
@@ -36,7 +36,8 @@
 
 #include <rump/rump.h>
 #include <rump/rump_syscalls.h>
-#include <rump/scsitest.h>
+
+#include "scsitest.h"
 
 #include "../../h_macros.h"