Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/tests/fs/common Rename xfs.c to fstest_xfs.c to avoid collis...
details: https://anonhg.NetBSD.org/src/rev/7f2b5b5be41f
branches: trunk
changeset: 756708:7f2b5b5be41f
user: pooka <pooka%NetBSD.org@localhost>
date: Thu Jul 29 14:15:46 2010 +0000
description:
Rename xfs.c to fstest_xfs.c to avoid collisions with other
source files with the name xfs.c
ok njoly
diffstat:
tests/fs/common/Makefile | 5 +-
tests/fs/common/ext2fs.c | 139 --------------
tests/fs/common/ffs.c | 137 --------------
tests/fs/common/fstest_ext2fs.c | 139 ++++++++++++++
tests/fs/common/fstest_ffs.c | 137 ++++++++++++++
tests/fs/common/fstest_lfs.c | 140 ++++++++++++++
tests/fs/common/fstest_msdosfs.c | 139 ++++++++++++++
tests/fs/common/fstest_nfs.c | 220 ++++++++++++++++++++++
tests/fs/common/fstest_puffs.c | 380 +++++++++++++++++++++++++++++++++++++++
tests/fs/common/fstest_sysvbfs.c | 139 ++++++++++++++
tests/fs/common/fstest_tmpfs.c | 112 +++++++++++
tests/fs/common/lfs.c | 140 --------------
tests/fs/common/msdosfs.c | 139 --------------
tests/fs/common/nfs.c | 220 ----------------------
tests/fs/common/puffs.c | 380 ---------------------------------------
tests/fs/common/sysvbfs.c | 139 --------------
tests/fs/common/tmpfs.c | 112 -----------
17 files changed, 1409 insertions(+), 1408 deletions(-)
diffs (truncated from 2893 to 300 lines):
diff -r 97f145359656 -r 7f2b5b5be41f tests/fs/common/Makefile
--- a/tests/fs/common/Makefile Thu Jul 29 14:09:45 2010 +0000
+++ b/tests/fs/common/Makefile Thu Jul 29 14:15:46 2010 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2010/07/26 16:15:49 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2010/07/29 14:15:46 pooka Exp $
#
.include <bsd.own.mk>
LIB= vfstest
-SRCS= ext2fs.c ffs.c lfs.c msdosfs.c nfs.c puffs.c sysvbfs.c tmpfs.c
+SRCS= fstest_ext2fs.c fstest_ffs.c fstest_lfs.c fstest_msdosfs.c \
+ fstest_nfs.c fstest_puffs.c fstest_sysvbfs.c fstest_tmpfs.c
WARNS= 3
diff -r 97f145359656 -r 7f2b5b5be41f tests/fs/common/ext2fs.c
--- a/tests/fs/common/ext2fs.c Thu Jul 29 14:09:45 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-/* $NetBSD: ext2fs.c,v 1.5 2010/07/19 16:09:08 pooka Exp $ */
-
-/*-
- * Copyright (c) 2010 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Nicolas Joly.
- *
- * 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/mount.h>
-#include <sys/stat.h>
-
-#include <atf-c.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <ufs/ufs/ufsmount.h>
-
-#include <rump/rump.h>
-#include <rump/rump_syscalls.h>
-
-#include "h_fsmacros.h"
-
-struct ext2fstestargs {
- struct ufs_args ta_uargs;
- char ta_devpath[MAXPATHLEN];
- char ta_imgpath[MAXPATHLEN];
-};
-
-int
-ext2fs_fstest_newfs(const atf_tc_t *tc, void **buf, const char *image,
- off_t size)
-{
- char cmd[1024];
- int res;
- static unsigned int num = 0;
- struct ext2fstestargs *args;
-
- size /= 512;
- snprintf(cmd, 1024, "newfs_ext2fs -F -s %"PRId64" %s >/dev/null",
- size, image);
- res = system(cmd);
- if (res != 0)
- return res;
-
- res = rump_init();
- if (res != 0)
- return res;
-
- args = calloc(1, sizeof(*args));
- if (args == NULL)
- return -1;
-
- snprintf(args->ta_devpath, MAXPATHLEN, "/dev/device%d.ext2fs", num);
- snprintf(args->ta_imgpath, MAXPATHLEN, "%s", image);
- args->ta_uargs.fspec = args->ta_devpath;
-
- res = rump_pub_etfs_register(args->ta_devpath, image, RUMP_ETFS_BLK);
- if (res != 0) {
- free(args);
- return res;
- }
-
- *buf = args;
- num++;
-
- return res;
-}
-
-int
-ext2fs_fstest_delfs(const atf_tc_t *tc, void *buf)
-{
- int res;
- struct ext2fstestargs *args = buf;
-
- res = rump_pub_etfs_remove(args->ta_devpath);
- if (res != 0)
- return res;
-
- res = unlink(args->ta_imgpath);
- if (res != 0)
- return res;
-
- free(args);
-
- return 0;
-}
-
-int
-ext2fs_fstest_mount(const atf_tc_t *tc, void *buf, const char *path, int flags)
-{
- int res;
- struct ext2fstestargs *args = buf;
-
- res = rump_sys_mkdir(path, 0777);
- if (res == -1)
- return res;
-
- res = rump_sys_mount(MOUNT_EXT2FS, path, flags, &args->ta_uargs,
- sizeof(args->ta_uargs));
- return res;
-}
-
-int
-ext2fs_fstest_unmount(const atf_tc_t *tc, const char *path, int flags)
-{
- int res;
-
- res = rump_sys_unmount(path, flags);
- if (res == -1)
- return res;
-
- res = rump_sys_rmdir(path);
- return res;
-}
diff -r 97f145359656 -r 7f2b5b5be41f tests/fs/common/ffs.c
--- a/tests/fs/common/ffs.c Thu Jul 29 14:09:45 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,137 +0,0 @@
-/* $NetBSD: ffs.c,v 1.5 2010/07/19 16:09:08 pooka Exp $ */
-
-/*-
- * Copyright (c) 2010 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Nicolas Joly.
- *
- * 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/mount.h>
-#include <sys/stat.h>
-
-#include <atf-c.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <ufs/ufs/ufsmount.h>
-
-#include <rump/rump.h>
-#include <rump/rump_syscalls.h>
-
-#include "h_fsmacros.h"
-
-struct ffstestargs {
- struct ufs_args ta_uargs;
- char ta_devpath[MAXPATHLEN];
- char ta_imgpath[MAXPATHLEN];
-};
-
-int
-ffs_fstest_newfs(const atf_tc_t *tc, void **buf, const char *image, off_t size)
-{
- char cmd[1024];
- int res;
- static unsigned int num = 0;
- struct ffstestargs *args;
-
- size /= 512;
- snprintf(cmd, 1024, "newfs -F -s %"PRId64" %s >/dev/null", size, image);
- res = system(cmd);
- if (res != 0)
- return res;
-
- res = rump_init();
- if (res != 0)
- return res;
-
- args = calloc(1, sizeof(*args));
- if (args == NULL)
- return -1;
-
- snprintf(args->ta_devpath, MAXPATHLEN, "/dev/device%d.ffs", num);
- snprintf(args->ta_imgpath, MAXPATHLEN, "%s", image);
- args->ta_uargs.fspec = args->ta_devpath;
-
- res = rump_pub_etfs_register(args->ta_devpath, image, RUMP_ETFS_BLK);
- if (res != 0) {
- free(args);
- return res;
- }
-
- *buf = args;
- num++;
-
- return 0;
-}
-
-int
-ffs_fstest_delfs(const atf_tc_t *tc, void *buf)
-{
- int res;
- struct ffstestargs *args = buf;
-
- res = rump_pub_etfs_remove(args->ta_devpath);
- if (res != 0)
- return res;
-
- res = unlink(args->ta_imgpath);
- if (res != 0)
- return res;
-
- free(args);
-
- return 0;
-}
-
-int
-ffs_fstest_mount(const atf_tc_t *tc, void *buf, const char *path, int flags)
-{
- int res;
- struct ffstestargs *args = buf;
-
- res = rump_sys_mkdir(path, 0777);
- if (res == -1)
- return res;
-
- res = rump_sys_mount(MOUNT_FFS, path, flags, &args->ta_uargs,
- sizeof(args->ta_uargs));
- return res;
-}
-
-int
-ffs_fstest_unmount(const atf_tc_t *tc, const char *path, int flags)
-{
- int res;
-
- res = rump_sys_unmount(path, flags);
- if (res == -1)
- return res;
-
- res = rump_sys_rmdir(path);
- return res;
Home |
Main Index |
Thread Index |
Old Index