Module Name: src
Committed By: jruoho
Date: Sat Oct 15 06:10:26 UTC 2011
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/kernel: Makefile
src/tests/lib/libc/sys: Makefile
Added Files:
src/tests/lib/libc/sys: t_posix_fadvise.c
Removed Files:
src/tests/kernel: t_posix_fadvise.c
Log Message:
Move the posix_fadvise(2) test to the right place.
To generate a diff of this commit:
cvs rdiff -u -r1.401 -r1.402 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.13 -r1.14 src/tests/kernel/Makefile
cvs rdiff -u -r1.6 -r0 src/tests/kernel/t_posix_fadvise.c
cvs rdiff -u -r1.9 -r1.10 src/tests/lib/libc/sys/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/sys/t_posix_fadvise.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.401 src/distrib/sets/lists/tests/mi:1.402
--- src/distrib/sets/lists/tests/mi:1.401 Thu Oct 13 07:47:30 2011
+++ src/distrib/sets/lists/tests/mi Sat Oct 15 06:10:26 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.401 2011/10/13 07:47:30 njoly Exp $
+# $NetBSD: mi,v 1.402 2011/10/15 06:10:26 jruoho Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -328,7 +328,7 @@
./usr/libdata/debug/usr/tests/kernel/t_pipe.debug tests-kernel-tests debug,atf
./usr/libdata/debug/usr/tests/kernel/t_poll3w.debug tests-kernel-tests debug,atf
./usr/libdata/debug/usr/tests/kernel/t_pollts.debug tests-obsolete obsolete
-./usr/libdata/debug/usr/tests/kernel/t_posix_fadvise.debug tests-kernel-tests debug,atf
+./usr/libdata/debug/usr/tests/kernel/t_posix_fadvise.debug tests-obsolete obsolete
./usr/libdata/debug/usr/tests/kernel/t_pty.debug tests-kernel-tests debug,atf
./usr/libdata/debug/usr/tests/kernel/t_rnd.debug tests-kernel-tests debug,atf
./usr/libdata/debug/usr/tests/kernel/t_sigaction.debug tests-kernel-tests debug,atf
@@ -511,6 +511,7 @@
./usr/libdata/debug/usr/tests/lib/libc/sys/t_msync.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/sys/t_nanosleep.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/sys/t_poll.debug tests-lib-debug debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/sys/t_posix_fadvise.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/sys/t_revoke.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/sys/t_select.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/sys/t_setrlimit.debug tests-lib-debug debug,atf
@@ -1851,7 +1852,7 @@
./usr/tests/kernel/t_pipe tests-kernel-tests atf
./usr/tests/kernel/t_poll3w tests-kernel-tests atf
./usr/tests/kernel/t_pollts tests-obsolete obsolete
-./usr/tests/kernel/t_posix_fadvise tests-kernel-tests atf
+./usr/tests/kernel/t_posix_fadvise tests-obsolete obsolete
./usr/tests/kernel/t_ps_strings tests-kernel-tests atf
./usr/tests/kernel/t_pty tests-kernel-tests atf
./usr/tests/kernel/t_rnd tests-kernel-tests atf
@@ -2123,6 +2124,7 @@
./usr/tests/lib/libc/sys/t_msync tests-lib-tests atf
./usr/tests/lib/libc/sys/t_nanosleep tests-lib-tests atf
./usr/tests/lib/libc/sys/t_poll tests-lib-tests atf
+./usr/tests/lib/libc/sys/t_posix_fadvise tests-lib-tests atf
./usr/tests/lib/libc/sys/t_revoke tests-lib-tests atf
./usr/tests/lib/libc/sys/t_select tests-lib-tests atf
./usr/tests/lib/libc/sys/t_setrlimit tests-lib-tests atf
Index: src/tests/kernel/Makefile
diff -u src/tests/kernel/Makefile:1.13 src/tests/kernel/Makefile:1.14
--- src/tests/kernel/Makefile:1.13 Sat Sep 24 15:53:01 2011
+++ src/tests/kernel/Makefile Sat Oct 15 06:10:26 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2011/09/24 15:53:01 christos Exp $
+# $NetBSD: Makefile,v 1.14 2011/10/15 06:10:26 jruoho Exp $
NOMAN= # defined
@@ -13,7 +13,6 @@ TESTS_C+= t_lwpctl
TESTS_C+= t_mkdir
TESTS_C+= t_pipe
TESTS_C+= t_poll3w
-TESTS_C+= t_posix_fadvise
TESTS_C+= t_pty
TESTS_C+= t_rnd
TESTS_C+= t_time
@@ -33,7 +32,6 @@ PROGS+= h_ps_strings2
LDADD.t_rnd+= -lrumpvfs -lrumpdev_rnd -lrumpdev -lrump -lrumpuser -lpthread
LDADD.t_filedesc+= -lrumpvfs -lrumpdev_rnd -lrumpdev -lrump -lrumpuser -lpthread
LDADD.t_extattrctl+= -lrumpvfs -lrump -lrumpuser -lpthread
-LDADD.t_posix_fadvise+= -lrumpvfs -lrump -lrumpuser -lpthread
.PATH: ${NETBSDSRCDIR}/sys/kern
TESTS_C+= t_extent
Index: src/tests/lib/libc/sys/Makefile
diff -u src/tests/lib/libc/sys/Makefile:1.9 src/tests/lib/libc/sys/Makefile:1.10
--- src/tests/lib/libc/sys/Makefile:1.9 Sat Sep 17 18:53:31 2011
+++ src/tests/lib/libc/sys/Makefile Sat Oct 15 06:10:26 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2011/09/17 18:53:31 jruoho Exp $
+# $NetBSD: Makefile,v 1.10 2011/10/15 06:10:26 jruoho Exp $
MKMAN= no
@@ -31,6 +31,7 @@ TESTS_C+= t_mmap
TESTS_C+= t_mprotect
TESTS_C+= t_msync
TESTS_C+= t_nanosleep
+TESTS_C+= t_posix_fadvise
TESTS_C+= t_poll
TESTS_C+= t_revoke
TESTS_C+= t_select
@@ -46,6 +47,7 @@ TESTS_C+= t_unlink
SRCS.t_mprotect= t_mprotect.c ${SRCS_EXEC_PROT}
LDADD.t_getpid+= -lpthread
+LDADD.t_posix_fadvise+= -lrumpvfs -lrump -lrumpuser -lpthread
WARNS= 4
Added files:
Index: src/tests/lib/libc/sys/t_posix_fadvise.c
diff -u /dev/null src/tests/lib/libc/sys/t_posix_fadvise.c:1.1
--- /dev/null Sat Oct 15 06:10:26 2011
+++ src/tests/lib/libc/sys/t_posix_fadvise.c Sat Oct 15 06:10:26 2011
@@ -0,0 +1,165 @@
+/* $NetBSD: t_posix_fadvise.c,v 1.1 2011/10/15 06:10:26 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by YAMAMOTO Takashi.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*-
+ * Copyright (c)2005 YAMAMOTO Takashi,
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_posix_fadvise.c,v 1.1 2011/10/15 06:10:26 jruoho Exp $");
+
+#include <sys/fcntl.h>
+
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+#include "../../../h_macros.h"
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+ATF_TC(posix_fadvise);
+ATF_TC_HEAD(posix_fadvise, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "Checks posix_fadvise(2)");
+}
+
+ATF_TC(posix_fadvise_reg);
+ATF_TC_HEAD(posix_fadvise_reg, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "Checks posix_fadvise(2) "
+ "for regular files");
+}
+
+ATF_TC_BODY(posix_fadvise, tc)
+{
+ int fd;
+ int pipe_fds[2];
+ int badfd = 10;
+ int ret;
+
+ RL(fd = open("/dev/null", O_RDWR));
+
+ (void)close(badfd);
+ RL(pipe(pipe_fds));
+
+ /*
+ * it's hard to check if posix_fadvise is working properly.
+ * only check return values here.
+ */
+
+ /* posix_fadvise shouldn't affect errno. */
+
+#define CE(x, exp) \
+ do { \
+ int save = errno; \
+ errno = 999; \
+ ATF_CHECK_EQ_MSG(ret = (x), exp, "got: %d", ret); \
+ ATF_CHECK_EQ_MSG(errno, 999, "got: %s", strerror(errno)); \
+ errno = save; \
+ } while (0);
+
+ CE(posix_fadvise(fd, 0, 0, -1), EINVAL);
+ CE(posix_fadvise(pipe_fds[0], 0, 0, POSIX_FADV_NORMAL), ESPIPE);
+ CE(posix_fadvise(badfd, 0, 0, POSIX_FADV_NORMAL), EBADF);
+ CE(posix_fadvise(fd, 0, 0, POSIX_FADV_NORMAL), 0);
+ CE(posix_fadvise(fd, 0, 0, POSIX_FADV_SEQUENTIAL), 0);
+ CE(posix_fadvise(fd, 0, 0, POSIX_FADV_RANDOM), 0);
+ CE(posix_fadvise(fd, 0, 0, POSIX_FADV_WILLNEED), 0);
+ CE(posix_fadvise(fd, 0, 0, POSIX_FADV_DONTNEED), 0);
+ CE(posix_fadvise(fd, 0, 0, POSIX_FADV_NOREUSE), 0);
+}
+
+ATF_TC_BODY(posix_fadvise_reg, tc)
+{
+ int rfd, ret;
+
+ rump_init();
+ RL(rfd = rump_sys_open("/a_file", O_CREAT, 0666));
+
+ CE(rump_sys_posix_fadvise(rfd, 0, 0, POSIX_FADV_NORMAL), 0);
+ CE(rump_sys_posix_fadvise(rfd, 0, 0, POSIX_FADV_SEQUENTIAL), 0);
+ CE(rump_sys_posix_fadvise(rfd, 0, 0, POSIX_FADV_RANDOM), 0);
+ CE(rump_sys_posix_fadvise(rfd, 0, 0, POSIX_FADV_WILLNEED), 0);
+ CE(rump_sys_posix_fadvise(rfd, 0, 0, POSIX_FADV_NOREUSE), 0);
+
+ CE(rump_sys_posix_fadvise(rfd,
+ INT64_MAX-getpagesize(), getpagesize(), POSIX_FADV_NORMAL), 0);
+ CE(rump_sys_posix_fadvise(rfd,
+ INT64_MAX-getpagesize(), getpagesize(), POSIX_FADV_SEQUENTIAL), 0);
+ CE(rump_sys_posix_fadvise(rfd,
+ INT64_MAX-getpagesize(), getpagesize(), POSIX_FADV_RANDOM), 0);
+ CE(rump_sys_posix_fadvise(rfd,
+ INT64_MAX-getpagesize(), getpagesize(), POSIX_FADV_WILLNEED), 0);
+ CE(rump_sys_posix_fadvise(rfd,
+ INT64_MAX-getpagesize(), getpagesize(), POSIX_FADV_NOREUSE), 0);
+
+ //atf_tc_expect_signal(-1, "http://mail-index.netbsd.org/source-changes-d/2010/11/11/msg002508.html";);
+ CE(rump_sys_posix_fadvise(rfd,
+ INT64_MAX-getpagesize(), getpagesize(), POSIX_FADV_DONTNEED), 0);
+ CE(rump_sys_posix_fadvise(rfd, 0, 0, POSIX_FADV_DONTNEED), 0);
+#undef CE
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+ ATF_TP_ADD_TC(tp, posix_fadvise);
+ ATF_TP_ADD_TC(tp, posix_fadvise_reg);
+
+ return atf_no_error();
+}
