[src/trunk]: src/tests/fs/common The cleaner is compiled into the ATF test ha...

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

details:   https://anonhg.NetBSD.org/src/rev/ea7737b562c6
branches:  trunk
changeset: 965063:ea7737b562c6
user:      brad <brad%NetBSD.org@localhost>
date:      Fri Aug 30 23:45:13 2019 +0000

description:
The cleaner is compiled into the ATF test harness for the LFS
filesystem tests.  Use the new -J option to pass the raw device into
the cleaner.  This avoids the not rump safe getdiskrawname call and
makes sure we use an internal rump device name for cleaning.  This
should fix bin/54488.

diffstat:

 tests/fs/common/fstest_lfs.c |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r d356ece77483 -r ea7737b562c6 tests/fs/common/fstest_lfs.c
--- a/tests/fs/common/fstest_lfs.c      Fri Aug 30 23:41:48 2019 +0000
+++ b/tests/fs/common/fstest_lfs.c      Fri Aug 30 23:45:13 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fstest_lfs.c,v 1.6 2019/01/20 14:50:58 gson Exp $      */
+/*     $NetBSD: fstest_lfs.c,v 1.7 2019/08/30 23:45:13 brad Exp $      */
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -125,7 +125,7 @@
 {
        char thepath[MAXPATHLEN];
        struct lfstestargs *args = arg;
-       const char *the_argv[7];
+       const char *the_argv[9];
        char buf[64];
 
        rump_pub_lwproc_newlwp(rump_sys_getpid());
@@ -139,14 +139,16 @@
        the_argv[1] = "-D"; /* don't fork() & detach */
        the_argv[2] = "-S";
        the_argv[3] = buf;
-       the_argv[4] = args->ta_mntpath;
-       the_argv[5] = NULL;
+       the_argv[4] = "-J";
+       the_argv[5] = thepath;
+       the_argv[6] = args->ta_mntpath;
+       the_argv[7] = NULL;
 
        /* xxxatf */
        optind = 1;
        opterr = 1;
 
-       lfs_cleaner_main(5, __UNCONST(the_argv));
+       lfs_cleaner_main(7, __UNCONST(the_argv));
 
        rump_pub_lwproc_releaselwp();