Sun Aug 10 06:57:32 2014 UTC ()
Rebase.


(tls)
diff -r1.14 -r1.14.22.1 src/tests/rump/rumpkern/Makefile
diff -r1.3 -r1.3.22.1 src/tests/rump/rumpkern/h_server/Makefile
diff -r1.3 -r1.3.20.1 src/tests/rump/rumpvfs/Makefile
diff -r1.9 -r1.9.22.1 src/tests/rump/rumpvfs/t_etfs.c
cvs diff -r1.14 -r1.14.22.1 src/tests/rump/rumpkern/Makefile (expand / switch to unified diff)

--- src/tests/rump/rumpkern/Makefile 2011/01/14 13:23:15 1.14
+++ src/tests/rump/rumpkern/Makefile 2014/08/10 06:57:32 1.14.22.1
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1# $NetBSD: Makefile,v 1.14 2011/01/14 13:23:15 pooka Exp $ 1# $NetBSD: Makefile,v 1.14.22.1 2014/08/10 06:57:32 tls Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5TESTSDIR= ${TESTSBASE}/rump/rumpkern 5TESTSDIR= ${TESTSBASE}/rump/rumpkern
6 6
7TESTS_C= t_copy 7TESTS_C= t_copy
8TESTS_C+= t_kern 8TESTS_C+= t_kern
9TESTS_C+= t_lwproc 9TESTS_C+= t_lwproc
10TESTS_C+= t_modcmd 10TESTS_C+= t_modcmd
11TESTS_C+= t_modlinkset 11TESTS_C+= t_modlinkset
12TESTS_C+= t_signals 12TESTS_C+= t_signals
13TESTS_C+= t_threads 13TESTS_C+= t_threads
14TESTS_C+= t_tsleep 14TESTS_C+= t_tsleep
15TESTS_C+= t_vm 15TESTS_C+= t_vm
16 16
17TESTS_SH= t_sp 17TESTS_SH= t_sp
18 18
19SUBDIR+= h_client h_server 19SUBDIR+= h_client h_server
20 20
21ADD_TO_LD= -lrumpvfs -lrump -lrumpuser -lpthread 21ADD_TO_LD= -lrumpvfs -lrump -lrumpuser -lrump -lpthread
22LDADD.t_modlinkset+= -lukfs -lrumpdev_disk -lrumpdev -lrumpfs_msdos  22LDADD.t_modlinkset+= -lukfs -lrumpdev_disk -lrumpdev -lrumpfs_msdos
23LDADD.t_modlinkset+= -lrumpfs_cd9660 ${ADD_TO_LD} 23LDADD.t_modlinkset+= -lrumpfs_cd9660 ${ADD_TO_LD}
24LDADD+= ${ADD_TO_LD} 24LDADD+= ${ADD_TO_LD}
25 25
26KERNSPACE != cd ${.CURDIR}/../kernspace && ${PRINTOBJDIR} 26KERNSPACE != cd ${.CURDIR}/../kernspace && ${PRINTOBJDIR}
27LDADD+= -L${KERNSPACE} -lkernspace 27LDADD+= -L${KERNSPACE} -lkernspace
28 28
29WARNS= 4 29WARNS= 4
30 30
31.include <bsd.test.mk> 31.include <bsd.test.mk>
cvs diff -r1.3 -r1.3.22.1 src/tests/rump/rumpkern/h_server/Makefile (expand / switch to unified diff)

--- src/tests/rump/rumpkern/h_server/Makefile 2011/01/14 13:23:15 1.3
+++ src/tests/rump/rumpkern/h_server/Makefile 2014/08/10 06:57:32 1.3.22.1
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.3 2011/01/14 13:23:15 pooka Exp $ 1# $NetBSD: Makefile,v 1.3.22.1 2014/08/10 06:57:32 tls Exp $
2# 2#
3 3
4.include <bsd.own.mk> 4.include <bsd.own.mk>
5 5
6TESTSDIR= ${TESTSBASE}/rump/rumpkern/h_server 6TESTSDIR= ${TESTSBASE}/rump/rumpkern/h_server
7 7
8TESTS_C= h_simpleserver 8TESTS_C= h_simpleserver
9 9
10ATFFILE= no 10ATFFILE= no
11 11
12LDADD+= -lrump -lrumpuser -lpthread 12LDADD+= -lrump -lrumpuser -lrump -lpthread
13 13
14WARNS= 4 14WARNS= 4
15NOMAN= 15NOMAN=
16 16
17KERNSPACE != cd ${.CURDIR}/../../kernspace && ${PRINTOBJDIR} 17KERNSPACE != cd ${.CURDIR}/../../kernspace && ${PRINTOBJDIR}
18LDADD+= -L${KERNSPACE} -lkernspace 18LDADD+= -L${KERNSPACE} -lkernspace
19 19
20.include <bsd.test.mk> 20.include <bsd.test.mk>
cvs diff -r1.3 -r1.3.20.1 src/tests/rump/rumpvfs/Makefile (expand / switch to unified diff)

--- src/tests/rump/rumpvfs/Makefile 2011/02/22 10:36:14 1.3
+++ src/tests/rump/rumpvfs/Makefile 2014/08/10 06:57:32 1.3.20.1
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# $NetBSD: Makefile,v 1.3 2011/02/22 10:36:14 pooka Exp $ 1# $NetBSD: Makefile,v 1.3.20.1 2014/08/10 06:57:32 tls Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5TESTSDIR= ${TESTSBASE}/rump/rumpvfs 5TESTSDIR= ${TESTSBASE}/rump/rumpvfs
6 6
7TESTS_C= t_basic 7TESTS_C= t_basic
8TESTS_C+= t_etfs 8TESTS_C+= t_etfs
9TESTS_C+= t_p2kifs 9TESTS_C+= t_p2kifs
10 10
11LDADD= -lrumpvfs -lrump -lrumpuser -lpthread 11LDADD= -lrumpvfs -lrump -lrumpuser -lrump -lpthread
12 12
13WARNS= 4 13WARNS= 4
14 14
15.include <bsd.test.mk> 15.include <bsd.test.mk>
cvs diff -r1.9 -r1.9.22.1 src/tests/rump/rumpvfs/t_etfs.c (expand / switch to unified diff)

--- src/tests/rump/rumpvfs/t_etfs.c 2010/11/30 18:19:47 1.9
+++ src/tests/rump/rumpvfs/t_etfs.c 2014/08/10 06:57:32 1.9.22.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: t_etfs.c,v 1.9 2010/11/30 18:19:47 pooka Exp $ */ 1/* $NetBSD: t_etfs.c,v 1.9.22.1 2014/08/10 06:57:32 tls Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2010 The NetBSD Foundation, Inc. 4 * Copyright (c) 2010 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -93,26 +93,28 @@ ATF_TC_BODY(reregister_reg, tc) @@ -93,26 +93,28 @@ ATF_TC_BODY(reregister_reg, tc)
93 93
94 /* check that we have what we expected */ 94 /* check that we have what we expected */
95 ATF_REQUIRE_STREQ(buf, TESTSTR1); 95 ATF_REQUIRE_STREQ(buf, TESTSTR1);
96 96
97 /* ... while here, check that writing works too */ 97 /* ... while here, check that writing works too */
98 ATF_REQUIRE_EQ(rump_sys_lseek(tfd, 0, SEEK_SET), 0); 98 ATF_REQUIRE_EQ(rump_sys_lseek(tfd, 0, SEEK_SET), 0);
99 ATF_REQUIRE(TESTSTR1SZ <= TESTSTR2SZ); 99 ATF_REQUIRE(TESTSTR1SZ <= TESTSTR2SZ);
100 ATF_REQUIRE_EQ(rump_sys_write(tfd, TESTSTR2, TESTSTR2SZ), TESTSTR2SZ); 100 ATF_REQUIRE_EQ(rump_sys_write(tfd, TESTSTR2, TESTSTR2SZ), TESTSTR2SZ);
101 101
102 memset(buf, 0, sizeof(buf)); 102 memset(buf, 0, sizeof(buf));
103 ATF_REQUIRE_EQ(lseek(localfd, 0, SEEK_SET), 0); 103 ATF_REQUIRE_EQ(lseek(localfd, 0, SEEK_SET), 0);
104 ATF_REQUIRE(read(localfd, buf, sizeof(buf)) > 0); 104 ATF_REQUIRE(read(localfd, buf, sizeof(buf)) > 0);
105 ATF_REQUIRE_STREQ(buf, TESTSTR2); 105 ATF_REQUIRE_STREQ(buf, TESTSTR2);
 106 close(etcfd);
 107 close(localfd);
106} 108}
107 109
108ATF_TC(reregister_blk); 110ATF_TC(reregister_blk);
109ATF_TC_HEAD(reregister_blk, tc) 111ATF_TC_HEAD(reregister_blk, tc)
110{ 112{
111 113
112 atf_tc_set_md_var(tc, "descr", "Tests register/unregister/register " 114 atf_tc_set_md_var(tc, "descr", "Tests register/unregister/register "
113 "for a block device"); 115 "for a block device");
114} 116}
115 117
116ATF_TC_BODY(reregister_blk, tc) 118ATF_TC_BODY(reregister_blk, tc)
117{ 119{
118 char buf[512 * 128]; 120 char buf[512 * 128];