Module Name: src
Committed By: martin
Date: Sun Nov 19 21:05:26 UTC 2017
Modified Files:
src/distrib/sets/lists/debug: mi
src/distrib/sets/lists/tests: mi
src/tests/fs/vfs: Makefile
Added Files:
src/tests/fs/vfs: t_mtime_write.c
Log Message:
ATF test program for PR kern/52738: check for mtime updates after rewriting
a file.
To generate a diff of this commit:
cvs rdiff -u -r1.228 -r1.229 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.766 -r1.767 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.24 -r1.25 src/tests/fs/vfs/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/fs/vfs/t_mtime_write.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/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.228 src/distrib/sets/lists/debug/mi:1.229
--- src/distrib/sets/lists/debug/mi:1.228 Mon Oct 30 15:59:23 2017
+++ src/distrib/sets/lists/debug/mi Sun Nov 19 21:05:26 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.228 2017/10/30 15:59:23 ozaki-r Exp $
+# $NetBSD: mi,v 1.229 2017/11/19 21:05:26 martin Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib comp-sys-usr compatdir
./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile
@@ -1652,6 +1652,7 @@
./usr/libdata/debug/usr/tests/fs/vfs/t_full.debug tests-fs-debug debug,atf,rump
./usr/libdata/debug/usr/tests/fs/vfs/t_io.debug tests-fs-debug debug,atf,rump
./usr/libdata/debug/usr/tests/fs/vfs/t_mtime_otrunc.debug tests-fs-debug debug,atf,rump
+./usr/libdata/debug/usr/tests/fs/vfs/t_mtime_write.debug tests-fs-debug debug,atf,rump
./usr/libdata/debug/usr/tests/fs/vfs/t_renamerace.debug tests-fs-debug debug,atf,rump
./usr/libdata/debug/usr/tests/fs/vfs/t_rmdirrace.debug tests-fs-debug debug,atf,rump
./usr/libdata/debug/usr/tests/fs/vfs/t_ro.debug tests-fs-debug debug,atf,rump
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.766 src/distrib/sets/lists/tests/mi:1.767
--- src/distrib/sets/lists/tests/mi:1.766 Wed Nov 1 08:44:34 2017
+++ src/distrib/sets/lists/tests/mi Sun Nov 19 21:05:26 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.766 2017/11/01 08:44:34 martin Exp $
+# $NetBSD: mi,v 1.767 2017/11/19 21:05:26 martin Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1555,6 +1555,7 @@
./usr/tests/fs/vfs/t_full tests-fs-tests atf,rump
./usr/tests/fs/vfs/t_io tests-fs-tests atf,rump
./usr/tests/fs/vfs/t_mtime_otrunc tests-fs-tests atf,rump
+./usr/tests/fs/vfs/t_mtime_write tests-fs-tests atf,rump
./usr/tests/fs/vfs/t_renamerace tests-fs-tests atf,rump
./usr/tests/fs/vfs/t_rmdirrace tests-fs-tests atf,rump
./usr/tests/fs/vfs/t_ro tests-fs-tests atf,rump
Index: src/tests/fs/vfs/Makefile
diff -u src/tests/fs/vfs/Makefile:1.24 src/tests/fs/vfs/Makefile:1.25
--- src/tests/fs/vfs/Makefile:1.24 Thu Feb 2 22:07:05 2017
+++ src/tests/fs/vfs/Makefile Sun Nov 19 21:05:26 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2017/02/02 22:07:05 martin Exp $
+# $NetBSD: Makefile,v 1.25 2017/11/19 21:05:26 martin Exp $
#
.include <bsd.own.mk>
@@ -15,6 +15,7 @@ TESTS_C+= t_rwtoro
TESTS_C+= t_union
TESTS_C+= t_unpriv
TESTS_C+= t_mtime_otrunc
+TESTS_C+= t_mtime_write
TESTS_C+= t_vfsops
TESTS_C+= t_vnops
Added files:
Index: src/tests/fs/vfs/t_mtime_write.c
diff -u /dev/null src/tests/fs/vfs/t_mtime_write.c:1.1
--- /dev/null Sun Nov 19 21:05:26 2017
+++ src/tests/fs/vfs/t_mtime_write.c Sun Nov 19 21:05:26 2017
@@ -0,0 +1,87 @@
+/*-
+ * Copyright (c) 2017 The NetBSD Foundation, Inc.
+ * 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 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2013\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_mtime_write.c,v 1.1 2017/11/19 21:05:26 martin Exp $");
+
+#include <errno.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <atf-c.h>
+
+#include <rump/rump_syscalls.h>
+#include <rump/rump.h>
+
+#include "../common/h_fsmacros.h"
+
+#define LOCKFILE "lock"
+
+static time_t
+lock_it(void)
+{
+ struct stat st;
+
+ if (rump_sys_stat(LOCKFILE, &st) != 0)
+ st.st_mtime = 0;
+
+ int f = rump_sys_open(LOCKFILE, O_WRONLY|O_CREAT, 0666);
+ if (f == -1) return 0;
+ rump_sys_write(f, &st, sizeof st);
+ rump_sys_close(f);
+
+ return st.st_mtime;
+}
+
+static void
+mtime_update_on_write(const atf_tc_t *tc, const char *path)
+{
+ time_t last_ts = 0;
+ int res;
+
+ /* atf_tc_expect_fail("PR kern/52738"); */
+
+ res = rump_sys_chdir(path);
+ if (res == -1)
+ atf_tc_fail("chdir failed");
+
+ for (int i = 0; i < 5; i++) {
+ time_t l = lock_it();
+ printf("last lock: %ld\n", (long)l);
+ ATF_REQUIRE_MSG(i == 0 || l > last_ts,
+ "iteration %d: lock time did not increase, old time %lu, "
+ "new time %lu", i,
+ (unsigned long)last_ts, (unsigned long)l);
+ last_ts = l;
+ sleep(2);
+ }
+ rump_sys_chdir("/");
+}
+
+ATF_FSAPPLY(mtime_update_on_write, "Checks for mtime updates by writing (PR kern/52738)");
