Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

obsolete the installed <rump/scsitest.h> header and make it private 

to tests/dev/scsipi
This commit is contained in:
pooka 2014-04-25 00:24:39 +00:00
parent 4460048395
commit 0159a35e80
6 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
distrib/sets/lists/comp/mi
View File

@ -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

4
sys/rump/include/rump/Makefile
View File

@ -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>

4
tests/dev/scsipi/Makefile
View File

@ -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}

7
tests/dev/scsipi/libscsitest/scsitest.c
View File

@ -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 *);

2
sys/rump/include/rump/scsitest.h → tests/dev/scsipi/libscsitest/scsitest.h
View File

@ -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.

5
tests/dev/scsipi/t_cd.c
View File

@ -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"