[src/trunk]: src/tests/fs/common add another fstype for ffs -o log

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ef1b13a96790
branches:  trunk
changeset: 760549:ef1b13a96790
user:      pooka <pooka%NetBSD.org@localhost>
date:      Fri Jan 07 11:52:59 2011 +0000

description:
add another fstype for ffs -o log

diffstat:

 tests/fs/common/fstest_ffs.c |  12 +++++++++++-
 tests/fs/common/h_fsmacros.h |   9 ++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diffs (102 lines):

diff -r 07f4138c114f -r ef1b13a96790 tests/fs/common/fstest_ffs.c
--- a/tests/fs/common/fstest_ffs.c      Fri Jan 07 11:50:37 2011 +0000
+++ b/tests/fs/common/fstest_ffs.c      Fri Jan 07 11:52:59 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fstest_ffs.c,v 1.2 2010/07/30 16:15:05 pooka Exp $     */
+/*     $NetBSD: fstest_ffs.c,v 1.3 2011/01/07 11:52:59 pooka Exp $     */
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -89,6 +89,7 @@
 
        return 0;
 }
+__strong_alias(ffslog_fstest_newfs,ffs_fstest_newfs);
 
 int
 ffs_fstest_delfs(const atf_tc_t *tc, void *buf)
@@ -108,6 +109,7 @@
 
        return 0;
 }
+__strong_alias(ffslog_fstest_delfs,ffs_fstest_delfs);
 
 int
 ffs_fstest_mount(const atf_tc_t *tc, void *buf, const char *path, int flags)
@@ -125,6 +127,13 @@
 }
 
 int
+ffslog_fstest_mount(const atf_tc_t *tc, void *buf, const char *path, int flags)
+{
+
+       return ffs_fstest_mount(tc, buf, path, flags | MNT_LOG);
+}
+
+int
 ffs_fstest_unmount(const atf_tc_t *tc, const char *path, int flags)
 {
        int res;
@@ -136,3 +145,4 @@
        res = rump_sys_rmdir(path);
        return res;
 }
+__strong_alias(ffslog_fstest_unmount,ffs_fstest_unmount);
diff -r 07f4138c114f -r ef1b13a96790 tests/fs/common/h_fsmacros.h
--- a/tests/fs/common/h_fsmacros.h      Fri Jan 07 11:50:37 2011 +0000
+++ b/tests/fs/common/h_fsmacros.h      Fri Jan 07 11:52:59 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: h_fsmacros.h,v 1.27 2011/01/07 11:41:40 pooka Exp $    */
+/*     $NetBSD: h_fsmacros.h,v 1.28 2011/01/07 11:52:59 pooka Exp $    */
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -51,6 +51,7 @@
 
 FSPROTOS(ext2fs);
 FSPROTOS(ffs);
+FSPROTOS(ffslog);
 FSPROTOS(lfs);
 FSPROTOS(msdosfs);
 FSPROTOS(nfs);
@@ -169,6 +170,7 @@
 #define ATF_TC_FSAPPLY(func,desc)                                      \
   ATF_TC_FSADD(ext2fs,MOUNT_EXT2FS,func,desc)                          \
   ATF_TC_FSADD(ffs,MOUNT_FFS,func,desc)                                        \
+  ATF_TC_FSADD(ffslog,MOUNT_FFS,func,desc)                             \
   ATF_TC_FSADD(lfs,MOUNT_LFS,func,desc)                                        \
   ATF_TC_FSADD(msdosfs,MOUNT_MSDOS,func,desc)                          \
   ATF_TC_FSADD(nfs,MOUNT_NFS,func,desc)                                        \
@@ -181,6 +183,7 @@
 #define ATF_TP_FSAPPLY(func)                                           \
   ATF_TP_FSADD(ext2fs,func);                                           \
   ATF_TP_FSADD(ffs,func);                                              \
+  ATF_TP_FSADD(ffslog,func);                                           \
   ATF_TP_FSADD(lfs,func);                                              \
   ATF_TP_FSADD(msdosfs,func);                                          \
   ATF_TP_FSADD(nfs,func);                                              \
@@ -204,6 +207,7 @@
 #define ATF_TC_FSAPPLY_RO(func,desc,gen)                               \
   ATF_TC_FSADD_RO(ext2fs,MOUNT_EXT2FS,func,desc,gen)                   \
   ATF_TC_FSADD_RO(ffs,MOUNT_FFS,func,desc,gen)                         \
+  ATF_TC_FSADD_RO(ffslog,MOUNT_FFS,func,desc,gen)                      \
   ATF_TC_FSADD_RO(msdosfs,MOUNT_MSDOS,func,desc,gen)                   \
   ATF_TC_FSADD_RO(nfs,MOUNT_NFS,func,desc,gen)                         \
   ATF_TC_FSADD_RO(nfsro,MOUNT_NFS,func,desc,gen)                       \
@@ -212,6 +216,7 @@
 #define ATF_TP_FSAPPLY_RO(func)                                                \
   ATF_TP_FSADD(ext2fs,func);                                           \
   ATF_TP_FSADD(ffs,func);                                              \
+  ATF_TP_FSADD(ffslog,func);                                           \
   ATF_TP_FSADD(msdosfs,func);                                          \
   ATF_TP_FSADD(nfs,func);                                              \
   ATF_TP_FSADD(nfsro,func);                                            \
@@ -243,6 +248,8 @@
     (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "ext2fs") == 0)
 #define FSTYPE_FFS(tc)\
     (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "ffs") == 0)
+#define FSTYPE_FFSLOG(tc)\
+    (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "ffs") == 0)
 #define FSTYPE_LFS(tc)\
     (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "lfs") == 0)
 #define FSTYPE_MSDOS(tc)\