Module Name: src
Committed By: tls
Date: Sun Aug 10 06:57:32 UTC 2014
Modified Files:
src/tests/rump/rumpkern [tls-earlyentropy]: Makefile
src/tests/rump/rumpkern/h_server [tls-earlyentropy]: Makefile
src/tests/rump/rumpvfs [tls-earlyentropy]: Makefile t_etfs.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.22.1 src/tests/rump/rumpkern/Makefile
cvs rdiff -u -r1.3 -r1.3.22.1 src/tests/rump/rumpkern/h_server/Makefile
cvs rdiff -u -r1.3 -r1.3.20.1 src/tests/rump/rumpvfs/Makefile
cvs rdiff -u -r1.9 -r1.9.22.1 src/tests/rump/rumpvfs/t_etfs.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/rump/rumpkern/Makefile
diff -u src/tests/rump/rumpkern/Makefile:1.14 src/tests/rump/rumpkern/Makefile:1.14.22.1
--- src/tests/rump/rumpkern/Makefile:1.14 Fri Jan 14 13:23:15 2011
+++ src/tests/rump/rumpkern/Makefile Sun Aug 10 06:57:32 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2011/01/14 13:23:15 pooka Exp $
+# $NetBSD: Makefile,v 1.14.22.1 2014/08/10 06:57:32 tls Exp $
.include <bsd.own.mk>
@@ -18,7 +18,7 @@ TESTS_SH= t_sp
SUBDIR+= h_client h_server
-ADD_TO_LD= -lrumpvfs -lrump -lrumpuser -lpthread
+ADD_TO_LD= -lrumpvfs -lrump -lrumpuser -lrump -lpthread
LDADD.t_modlinkset+= -lukfs -lrumpdev_disk -lrumpdev -lrumpfs_msdos
LDADD.t_modlinkset+= -lrumpfs_cd9660 ${ADD_TO_LD}
LDADD+= ${ADD_TO_LD}
Index: src/tests/rump/rumpkern/h_server/Makefile
diff -u src/tests/rump/rumpkern/h_server/Makefile:1.3 src/tests/rump/rumpkern/h_server/Makefile:1.3.22.1
--- src/tests/rump/rumpkern/h_server/Makefile:1.3 Fri Jan 14 13:23:15 2011
+++ src/tests/rump/rumpkern/h_server/Makefile Sun Aug 10 06:57:32 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/01/14 13:23:15 pooka Exp $
+# $NetBSD: Makefile,v 1.3.22.1 2014/08/10 06:57:32 tls Exp $
#
.include <bsd.own.mk>
@@ -9,7 +9,7 @@ TESTS_C= h_simpleserver
ATFFILE= no
-LDADD+= -lrump -lrumpuser -lpthread
+LDADD+= -lrump -lrumpuser -lrump -lpthread
WARNS= 4
NOMAN=
Index: src/tests/rump/rumpvfs/Makefile
diff -u src/tests/rump/rumpvfs/Makefile:1.3 src/tests/rump/rumpvfs/Makefile:1.3.20.1
--- src/tests/rump/rumpvfs/Makefile:1.3 Tue Feb 22 10:36:14 2011
+++ src/tests/rump/rumpvfs/Makefile Sun Aug 10 06:57:32 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/02/22 10:36:14 pooka Exp $
+# $NetBSD: Makefile,v 1.3.20.1 2014/08/10 06:57:32 tls Exp $
.include <bsd.own.mk>
@@ -8,7 +8,7 @@ TESTS_C= t_basic
TESTS_C+= t_etfs
TESTS_C+= t_p2kifs
-LDADD= -lrumpvfs -lrump -lrumpuser -lpthread
+LDADD= -lrumpvfs -lrump -lrumpuser -lrump -lpthread
WARNS= 4
Index: src/tests/rump/rumpvfs/t_etfs.c
diff -u src/tests/rump/rumpvfs/t_etfs.c:1.9 src/tests/rump/rumpvfs/t_etfs.c:1.9.22.1
--- src/tests/rump/rumpvfs/t_etfs.c:1.9 Tue Nov 30 18:19:47 2010
+++ src/tests/rump/rumpvfs/t_etfs.c Sun Aug 10 06:57:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: t_etfs.c,v 1.9 2010/11/30 18:19:47 pooka Exp $ */
+/* $NetBSD: t_etfs.c,v 1.9.22.1 2014/08/10 06:57:32 tls Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -103,6 +103,8 @@ ATF_TC_BODY(reregister_reg, tc)
ATF_REQUIRE_EQ(lseek(localfd, 0, SEEK_SET), 0);
ATF_REQUIRE(read(localfd, buf, sizeof(buf)) > 0);
ATF_REQUIRE_STREQ(buf, TESTSTR2);
+ close(etcfd);
+ close(localfd);
}
ATF_TC(reregister_blk);
