D54016.1769320861.diff
No OneTemporary
Actions

Size

23 KB

Referenced Files

None

Subscribers

None

D54016.1769320861.diff
View Options

	diff --git a/bin/df/Makefile b/bin/df/Makefile
	--- a/bin/df/Makefile
	+++ b/bin/df/Makefile
	@@ -1,8 +1,12 @@
	-PACKAGE=runtime
	+.include <src.opts.mk>

	+PACKAGE=runtime
	PROG= df
	SRCS= df.c

	LIBADD= xo util

	+HAS_TESTS=
	+SUBDIR.${MK_TESTS}+= tests
	+
	.include <bsd.prog.mk>
	diff --git a/bin/df/tests/Makefile b/bin/df/tests/Makefile
	new file mode 100644
	--- /dev/null
	+++ b/bin/df/tests/Makefile
	@@ -0,0 +1,13 @@
	+PACKAGE= tests
	+
	+ATF_TESTS_SH= t_df
	+
	+PROGS+= h_df
	+BINDIR.h_df= ${TESTSDIR}
	+
	+.PATH: ${SRCTOP}/bin/df
	+SRCS= df.c getmntinfo.c
	+
	+LIBADD= xo util
	+
	+.include <bsd.test.mk>
	diff --git a/bin/df/tests/Makefile.depend b/bin/df/tests/Makefile.depend
	new file mode 100644
	--- /dev/null
	+++ b/bin/df/tests/Makefile.depend
	@@ -0,0 +1,10 @@
	+# Autogenerated - do NOT edit!
	+
	+DIRDEPS = \
	+
	+
	+.include <dirdeps.mk>
	+
	+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
	+# local dependencies - needed for -jN in clean tree
	+.endif
	diff --git a/bin/df/tests/getmntinfo.c b/bin/df/tests/getmntinfo.c
	new file mode 100644
	--- /dev/null
	+++ b/bin/df/tests/getmntinfo.c
	@@ -0,0 +1,187 @@
	+/*
	+ * Copyright (c) 2007 The NetBSD Foundation, Inc.
	+ * All rights reserved.
	+ *
	+ * SPDX-License-Identifier: BSD-2-Clause
	+ */
	+
	+#include <sys/param.h>
	+#include <sys/ucred.h>
	+#include <sys/mount.h>
	+
	+#include <err.h>
	+#include <stdlib.h>
	+#include <string.h>
	+
	+#define KB * 1024
	+#define MB * 1024 KB
	+#define GB * 1024 MB
	+
	+static struct statfs *getnewstatfs(void);
	+static void other_variants(const struct statfs , const int , int,
	+ const int *, int);
	+static void setup_filer(void);
	+static void setup_ld0g(void);
	+static void setup_strpct(void);
	+
	+static struct statfs *allstatfs;
	+static int sftotal, sfused;
	+
	+struct statfs *
	+getnewstatfs(void)
	+{
	+ if (sftotal == sfused) {
	+ sftotal = sftotal ? sftotal * 2 : 1;
	+ allstatfs = realloc(allstatfs,
	+ sftotal * sizeof(struct statfs));
	+ if (allstatfs == NULL)
	+ err(EXIT_FAILURE, "realloc");
	+ }
	+
	+ return (&allstatfs[sfused++]);
	+}
	+
	+void
	+other_variants(const struct statfs tmpl, const int minfree, int minfreecnt,
	+ const int *consumed, int consumedcnt)
	+{
	+ int64_t total, used;
	+ struct statfs *sf;
	+ int i, j;
	+
	+ for (i = 0; i < minfreecnt; i++)
	+ for (j = 0; j < consumedcnt; j++) {
	+ sf = getnewstatfs();
	+ sf = tmpl;
	+ total = (int64_t)(u_long)sf->f_blocks * sf->f_bsize;
	+ used = total * consumed[j] / 100;
	+ sf->f_bfree = (total - used) / sf->f_bsize;
	+ sf->f_bavail = (total * (100 - minfree[i]) / 100 -
	+ used) / (int)sf->f_bsize;
	+ }
	+}
	+
	+/*
	+ * Parameter taken from:
	+ * http://mail-index.NetBSD.org/tech-userlevel/2004/03/24/0001.html
	+ */
	+void
	+setup_filer(void)
	+{
	+ static const struct statfs tmpl = {
	+#define BSIZE 512
	+#define TOTAL 1147ULL GB
	+#define USED 132ULL MB
	+ .f_bsize = BSIZE,
	+ .f_blocks = TOTAL / BSIZE,
	+ .f_bfree = (TOTAL - USED) / BSIZE,
	+ .f_bavail = (TOTAL - USED) / BSIZE,
	+ .f_mntfromname = "filer:/",
	+ .f_mntonname = "/filer",
	+#undef USED
	+#undef TOTAL
	+#undef BSIZE
	+ };
	+ static const int minfree[] = { 0, 5, 10, 15, };
	+ static const int consumed[] = { 0, 20, 60, 95, 100 };
	+
	+ *getnewstatfs() = tmpl;
	+ other_variants(&tmpl, minfree, sizeof(minfree) / sizeof(minfree[0]),
	+ consumed, sizeof(consumed) / sizeof(consumed[0]));
	+}
	+
	+/*
	+ * Parameter taken from:
	+ * http://mail-index.NetBSD.org/current-users/2004/03/01/0038.html
	+ */
	+void
	+setup_ld0g(void)
	+{
	+ static const struct statfs tmpl = {
	+#define BSIZE 4096 /* Guess */
	+#define TOTAL 1308726116ULL KB
	+#define USED 17901268ULL KB
	+#define AVAIL 1225388540ULL KB
	+ .f_bsize = BSIZE,
	+ .f_blocks = TOTAL / BSIZE,
	+ .f_bfree = (TOTAL - USED) / BSIZE,
	+ .f_bavail = AVAIL / BSIZE,
	+ .f_mntfromname = "/dev/ld0g",
	+ .f_mntonname = "/anon-root",
	+#undef AVAIL
	+#undef USED
	+#undef TOTAL
	+#undef BSIZE
	+ };
	+ static const int minfree[] = { 0, 5, 10, 15, };
	+ static const int consumed[] = { 0, 20, 60, 95, 100 };
	+
	+ *getnewstatfs() = tmpl;
	+ other_variants(&tmpl, minfree, sizeof(minfree) / sizeof(minfree[0]),
	+ consumed, sizeof(consumed) / sizeof(consumed[0]));
	+}
	+
	+/*
	+ * Test of NetBSD's strpct(3) with huge number.
	+ */
	+void
	+setup_strpct(void)
	+{
	+ static const struct statfs tmpl = {
	+#define BSIZE 4096 /* Guess */
	+#define TOTAL 0x4ffffffffULL KB
	+#define USED (TOTAL / 2)
	+#define AVAIL (TOTAL / 2)
	+ .f_bsize = BSIZE,
	+ .f_blocks = TOTAL / BSIZE,
	+ .f_bfree = (TOTAL - USED) / BSIZE,
	+ .f_bavail = AVAIL / BSIZE,
	+ .f_mntfromname = "/dev/strpct",
	+ .f_mntonname = "/strpct",
	+#undef AVAIL
	+#undef USED
	+#undef TOTAL
	+#undef BSIZE
	+ };
	+
	+ *getnewstatfs() = tmpl;
	+}
	+
	+/*
	+ * Parameter taken from:
	+ * http://www.netbsd.org/cgi-bin/query-pr-single.pl?number=23600
	+ */
	+static void
	+setup_gnats_pr23600(void)
	+{
	+ static const struct statfs tmpl = {
	+#define BSIZE 512
	+#define TOTAL 20971376ULL
	+#define USED 5719864ULL
	+#define AVAIL 15251512ULL
	+ .f_bsize = BSIZE,
	+ .f_blocks = TOTAL,
	+ .f_bfree = TOTAL - USED,
	+ .f_bavail = AVAIL,
	+ .f_mntfromname = "/dev/wd0e",
	+ .f_mntonname = "/mount/windows/C",
	+#undef AVAIL
	+#undef USED
	+#undef TOTAL
	+#undef BSIZE
	+ };
	+
	+ *getnewstatfs() = tmpl;
	+}
	+
	+int
	+getmntinfo(struct statfs **mntbufp, __unused int mode)
	+{
	+ setup_filer();
	+ setup_ld0g();
	+ setup_strpct();
	+ setup_gnats_pr23600();
	+
	+ *mntbufp = allstatfs;
	+ return (sfused);
	+}
	diff --git a/bin/df/tests/t_df.sh b/bin/df/tests/t_df.sh
	new file mode 100644
	--- /dev/null
	+++ b/bin/df/tests/t_df.sh
	@@ -0,0 +1,135 @@
	+#
	+# Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
	+# All rights reserved.
	+#
	+# SPDX-License-Identifier: BSD-2-Clause
	+#
	+
	+# Adapted from contrib/netbsd-tests/bin/df/t_df.sh
	+# $NetBSD: t_df.sh,v 1.4 2025/12/14 22:15:20 kre Exp $
	+
	+atf_test_case normal
	+normal_head()
	+{
	+ atf_set "descr" "Checks that the output of df without flags is" \
	+ "correct according to some already-known, sane" \
	+ "output"
	+}
	+normal_body()
	+{
	+ cat >expout <<EOF
	+Filesystem 1K-blocks Used Avail Capacity Mounted on
	+filer:/ 1202716672 135168 1202581504 0% /filer
	+filer:/ 1202716672 0 1202716672 0% /filer
	+filer:/ 1202716672 240543334 962173337 20% /filer
	+filer:/ 1202716672 721630003 481086668 60% /filer
	+filer:/ 1202716672 1142580838 60135833 95% /filer
	+filer:/ 1202716672 1202716672 0 100% /filer
	+filer:/ 1202716672 0 1142580838 0% /filer
	+filer:/ 1202716672 240543334 902037504 21% /filer
	+filer:/ 1202716672 721630003 420950835 63% /filer
	+filer:/ 1202716672 1142580838 0 100% /filer
	+filer:/ 1202716672 1202716672 -60135833 105% /filer
	+filer:/ 1202716672 0 1082445004 0% /filer
	+filer:/ 1202716672 240543334 841901670 22% /filer
	+filer:/ 1202716672 721630003 360815001 67% /filer
	+filer:/ 1202716672 1142580838 -60135833 106% /filer
	+filer:/ 1202716672 1202716672 -120271667 111% /filer
	+filer:/ 1202716672 0 1022309171 0% /filer
	+filer:/ 1202716672 240543334 781765836 24% /filer
	+filer:/ 1202716672 721630003 300679168 71% /filer
	+filer:/ 1202716672 1142580838 -120271667 112% /filer
	+filer:/ 1202716672 1202716672 -180407500 118% /filer
	+/dev/ld0g 1308726116 17901268 1225388540 1% /anon-root
	+/dev/ld0g 1308726116 0 1308726116 0% /anon-root
	+/dev/ld0g 1308726116 261745224 1046980892 20% /anon-root
	+/dev/ld0g 1308726116 785235672 523490444 60% /anon-root
	+/dev/ld0g 1308726116 1243289812 65436304 95% /anon-root
	+/dev/ld0g 1308726116 1308726116 0 100% /anon-root
	+/dev/ld0g 1308726116 0 1243289808 0% /anon-root
	+/dev/ld0g 1308726116 261745224 981544584 21% /anon-root
	+/dev/ld0g 1308726116 785235672 458054140 63% /anon-root
	+/dev/ld0g 1308726116 1243289812 0 100% /anon-root
	+/dev/ld0g 1308726116 1308726116 -65436304 105% /anon-root
	+/dev/ld0g 1308726116 0 1177853504 0% /anon-root
	+/dev/ld0g 1308726116 261745224 916108280 22% /anon-root
	+/dev/ld0g 1308726116 785235672 392617832 67% /anon-root
	+/dev/ld0g 1308726116 1243289812 -65436304 106% /anon-root
	+/dev/ld0g 1308726116 1308726116 -130872608 111% /anon-root
	+/dev/ld0g 1308726116 0 1112417196 0% /anon-root
	+/dev/ld0g 1308726116 261745224 850671972 24% /anon-root
	+/dev/ld0g 1308726116 785235672 327181528 71% /anon-root
	+/dev/ld0g 1308726116 1243289812 -130872608 112% /anon-root
	+/dev/ld0g 1308726116 1308726116 -196308916 118% /anon-root
	+/dev/strpct 21474836476 10737418240 10737418236 50% /strpct
	+/dev/wd0e 10485688 2859932 7625756 27% /mount/windows/C
	+EOF
	+ atf_check -s exit:0 -o file:expout -e empty \
	+ -x "BLOCKSIZE=1k $(atf_get_srcdir)/h_df -n"
	+}
	+
	+atf_test_case hflag
	+hflag_head()
	+{
	+ atf_set "descr" "Checks that the output of df is correct according" \
	+ "to some already-known, sane output when using the" \
	+ "human readable format"
	+}
	+hflag_body()
	+{
	+ cat >expout <<EOF
	+Filesystem Size Used Avail Capacity Mounted on
	+filer:/ 1.1T 132M 1.1T 0% /filer
	+filer:/ 1.1T 0B 1.1T 0% /filer
	+filer:/ 1.1T 229G 918G 20% /filer
	+filer:/ 1.1T 688G 459G 60% /filer
	+filer:/ 1.1T 1.1T 57G 95% /filer
	+filer:/ 1.1T 1.1T 0B 100% /filer
	+filer:/ 1.1T 0B 1.1T 0% /filer
	+filer:/ 1.1T 229G 860G 21% /filer
	+filer:/ 1.1T 688G 401G 63% /filer
	+filer:/ 1.1T 1.1T 0B 100% /filer
	+filer:/ 1.1T 1.1T -57G 105% /filer
	+filer:/ 1.1T 0B 1.0T 0% /filer
	+filer:/ 1.1T 229G 803G 22% /filer
	+filer:/ 1.1T 688G 344G 67% /filer
	+filer:/ 1.1T 1.1T -57G 106% /filer
	+filer:/ 1.1T 1.1T -115G 111% /filer
	+filer:/ 1.1T 0B 975G 0% /filer
	+filer:/ 1.1T 229G 746G 24% /filer
	+filer:/ 1.1T 688G 287G 71% /filer
	+filer:/ 1.1T 1.1T -115G 112% /filer
	+filer:/ 1.1T 1.1T -172G 118% /filer
	+/dev/ld0g 1.2T 17G 1.1T 1% /anon-root
	+/dev/ld0g 1.2T 0B 1.2T 0% /anon-root
	+/dev/ld0g 1.2T 250G 998G 20% /anon-root
	+/dev/ld0g 1.2T 749G 499G 60% /anon-root
	+/dev/ld0g 1.2T 1.2T 62G 95% /anon-root
	+/dev/ld0g 1.2T 1.2T 0B 100% /anon-root
	+/dev/ld0g 1.2T 0B 1.2T 0% /anon-root
	+/dev/ld0g 1.2T 250G 936G 21% /anon-root
	+/dev/ld0g 1.2T 749G 437G 63% /anon-root
	+/dev/ld0g 1.2T 1.2T 0B 100% /anon-root
	+/dev/ld0g 1.2T 1.2T -62G 105% /anon-root
	+/dev/ld0g 1.2T 0B 1.1T 0% /anon-root
	+/dev/ld0g 1.2T 250G 874G 22% /anon-root
	+/dev/ld0g 1.2T 749G 374G 67% /anon-root
	+/dev/ld0g 1.2T 1.2T -62G 106% /anon-root
	+/dev/ld0g 1.2T 1.2T -125G 111% /anon-root
	+/dev/ld0g 1.2T 0B 1.0T 0% /anon-root
	+/dev/ld0g 1.2T 250G 811G 24% /anon-root
	+/dev/ld0g 1.2T 749G 312G 71% /anon-root
	+/dev/ld0g 1.2T 1.2T -125G 112% /anon-root
	+/dev/ld0g 1.2T 1.2T -187G 118% /anon-root
	+/dev/strpct 20T 10T 10T 50% /strpct
	+/dev/wd0e 10G 2.7G 7.3G 27% /mount/windows/C
	+EOF
	+ atf_check -s exit:0 -o file:expout -e empty \
	+ -x "BLOCKSIZE=1k $(atf_get_srcdir)/h_df -hn"
	+}
	+
	+atf_init_test_cases()
	+{
	+ atf_add_test_case normal
	+ atf_add_test_case hflag
	+}
	diff --git a/contrib/netbsd-tests/bin/df/t_df.sh b/contrib/netbsd-tests/bin/df/t_df.sh
	old mode 100755
	new mode 100644
	--- a/contrib/netbsd-tests/bin/df/t_df.sh
	+++ b/contrib/netbsd-tests/bin/df/t_df.sh
	@@ -1,4 +1,4 @@
	-# $NetBSD: t_df.sh,v 1.1 2012/03/17 16:33:11 jruoho Exp $
	+# $NetBSD: t_df.sh,v 1.4 2025/12/14 22:15:20 kre Exp $
	#
	# Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
	# All rights reserved.
	@@ -33,53 +33,53 @@
	}
	normal_body() {
	cat >expout <<EOF
	-Filesystem 1K-blocks Used Avail %Cap Mounted on
	-filer:/ 1202716672 135168 1202581504 0% /filer
	-filer:/ 1202716672 0 1202716672 0% /filer
	-filer:/ 1202716672 240543334 962173337 20% /filer
	-filer:/ 1202716672 721630003 481086668 60% /filer
	-filer:/ 1202716672 1142580838 60135833 95% /filer
	-filer:/ 1202716672 1202716672 0 100% /filer
	-filer:/ 1202716672 0 1142580838 0% /filer
	-filer:/ 1202716672 240543334 902037504 21% /filer
	-filer:/ 1202716672 721630003 420950835 63% /filer
	-filer:/ 1202716672 1142580838 0 100% /filer
	-filer:/ 1202716672 1202716672 -60135833 105% /filer
	-filer:/ 1202716672 0 1082445004 0% /filer
	-filer:/ 1202716672 240543334 841901670 22% /filer
	-filer:/ 1202716672 721630003 360815001 66% /filer
	-filer:/ 1202716672 1142580838 -60135833 105% /filer
	-filer:/ 1202716672 1202716672 -120271667 111% /filer
	-filer:/ 1202716672 0 1022309171 0% /filer
	-filer:/ 1202716672 240543334 781765836 23% /filer
	-filer:/ 1202716672 721630003 300679168 70% /filer
	-filer:/ 1202716672 1142580838 -120271667 111% /filer
	-filer:/ 1202716672 1202716672 -180407500 117% /filer
	-/dev/ld0g 1308726116 17901268 1225388540 1% /anon-root
	-/dev/ld0g 1308726116 0 1308726116 0% /anon-root
	-/dev/ld0g 1308726116 261745224 1046980892 20% /anon-root
	-/dev/ld0g 1308726116 785235672 523490444 60% /anon-root
	-/dev/ld0g 1308726116 1243289812 65436304 95% /anon-root
	-/dev/ld0g 1308726116 1308726116 0 100% /anon-root
	-/dev/ld0g 1308726116 0 1243289808 0% /anon-root
	-/dev/ld0g 1308726116 261745224 981544584 21% /anon-root
	-/dev/ld0g 1308726116 785235672 458054140 63% /anon-root
	-/dev/ld0g 1308726116 1243289812 0 100% /anon-root
	-/dev/ld0g 1308726116 1308726116 -65436304 105% /anon-root
	-/dev/ld0g 1308726116 0 1177853504 0% /anon-root
	-/dev/ld0g 1308726116 261745224 916108280 22% /anon-root
	-/dev/ld0g 1308726116 785235672 392617832 66% /anon-root
	-/dev/ld0g 1308726116 1243289812 -65436304 105% /anon-root
	-/dev/ld0g 1308726116 1308726116 -130872608 111% /anon-root
	-/dev/ld0g 1308726116 0 1112417196 0% /anon-root
	-/dev/ld0g 1308726116 261745224 850671972 23% /anon-root
	-/dev/ld0g 1308726116 785235672 327181528 70% /anon-root
	-/dev/ld0g 1308726116 1243289812 -130872608 111% /anon-root
	-/dev/ld0g 1308726116 1308726116 -196308916 117% /anon-root
	-/dev/strpct 21474836476 10737418240 10737418236 50% /strpct
	-/dev/wd0e 10485688 2859932 7625756 27% /mount/windows/C
	+Filesystem 1K-blocks Used Avail %Cap Mounted on
	+filer:/ 1202716672 135168 1202581504 1% /filer
	+filer:/ 1202716672 0 1202716672 0% /filer
	+filer:/ 1202716672 240543334 962173337 21% /filer
	+filer:/ 1202716672 721630003 481086668 61% /filer
	+filer:/ 1202716672 1142580838 60135833 96% /filer
	+filer:/ 1202716672 1202716672 0 100% /filer
	+filer:/ 1202716672 0 1142580838 0% /filer
	+filer:/ 1202716672 240543334 902037504 22% /filer
	+filer:/ 1202716672 721630003 420950835 64% /filer
	+filer:/ 1202716672 1142580838 0 100% /filer
	+filer:/ 1202716672 1202716672 -60135833 106% /filer
	+filer:/ 1202716672 0 1082445004 0% /filer
	+filer:/ 1202716672 240543334 841901670 23% /filer
	+filer:/ 1202716672 721630003 360815001 67% /filer
	+filer:/ 1202716672 1142580838 -60135833 106% /filer
	+filer:/ 1202716672 1202716672 -120271667 112% /filer
	+filer:/ 1202716672 0 1022309171 0% /filer
	+filer:/ 1202716672 240543334 781765836 24% /filer
	+filer:/ 1202716672 721630003 300679168 71% /filer
	+filer:/ 1202716672 1142580838 -120271667 112% /filer
	+filer:/ 1202716672 1202716672 -180407500 118% /filer
	+/dev/ld0g 1308726116 17901268 1225388540 2% /anon-root
	+/dev/ld0g 1308726116 0 1308726116 0% /anon-root
	+/dev/ld0g 1308726116 261745224 1046980892 21% /anon-root
	+/dev/ld0g 1308726116 785235672 523490444 61% /anon-root
	+/dev/ld0g 1308726116 1243289812 65436304 96% /anon-root
	+/dev/ld0g 1308726116 1308726116 0 100% /anon-root
	+/dev/ld0g 1308726116 0 1243289808 0% /anon-root
	+/dev/ld0g 1308726116 261745224 981544584 22% /anon-root
	+/dev/ld0g 1308726116 785235672 458054140 64% /anon-root
	+/dev/ld0g 1308726116 1243289812 0 100% /anon-root
	+/dev/ld0g 1308726116 1308726116 -65436304 106% /anon-root
	+/dev/ld0g 1308726116 0 1177853504 0% /anon-root
	+/dev/ld0g 1308726116 261745224 916108280 23% /anon-root
	+/dev/ld0g 1308726116 785235672 392617832 67% /anon-root
	+/dev/ld0g 1308726116 1243289812 -65436304 106% /anon-root
	+/dev/ld0g 1308726116 1308726116 -130872608 112% /anon-root
	+/dev/ld0g 1308726116 0 1112417196 0% /anon-root
	+/dev/ld0g 1308726116 261745224 850671972 24% /anon-root
	+/dev/ld0g 1308726116 785235672 327181528 71% /anon-root
	+/dev/ld0g 1308726116 1243289812 -130872608 112% /anon-root
	+/dev/ld0g 1308726116 1308726116 -196308916 118% /anon-root
	+/dev/strpct 21474836476 10737418240 10737418236 51% /strpct
	+/dev/wd0e 10485688 2859932 7625756 28% /mount/windows/C
	EOF
	- atf_check -s eq:0 -o file:expout -e empty \
	+ atf_check -s exit:0 -o file:expout -e empty \
	-x "BLOCKSIZE=1k $(atf_get_srcdir)/h_df -n"
	}

	@@ -91,53 +91,53 @@
	}
	hflag_body() {
	cat >expout <<EOF
	-Filesystem Size Used Avail %Cap Mounted on
	-filer:/ 1.1T 132M 1.1T 0% /filer
	-filer:/ 1.1T 0B 1.1T 0% /filer
	-filer:/ 1.1T 229G 918G 20% /filer
	-filer:/ 1.1T 688G 459G 60% /filer
	-filer:/ 1.1T 1.1T 57G 95% /filer
	-filer:/ 1.1T 1.1T 0B 100% /filer
	-filer:/ 1.1T 0B 1.1T 0% /filer
	-filer:/ 1.1T 229G 860G 21% /filer
	-filer:/ 1.1T 688G 401G 63% /filer
	-filer:/ 1.1T 1.1T 0B 100% /filer
	-filer:/ 1.1T 1.1T -57G 105% /filer
	-filer:/ 1.1T 0B 1.0T 0% /filer
	-filer:/ 1.1T 229G 803G 22% /filer
	-filer:/ 1.1T 688G 344G 66% /filer
	-filer:/ 1.1T 1.1T -57G 105% /filer
	-filer:/ 1.1T 1.1T -115G 111% /filer
	-filer:/ 1.1T 0B 975G 0% /filer
	-filer:/ 1.1T 229G 746G 23% /filer
	-filer:/ 1.1T 688G 287G 70% /filer
	-filer:/ 1.1T 1.1T -115G 111% /filer
	-filer:/ 1.1T 1.1T -172G 117% /filer
	-/dev/ld0g 1.2T 17G 1.1T 1% /anon-root
	-/dev/ld0g 1.2T 0B 1.2T 0% /anon-root
	-/dev/ld0g 1.2T 250G 998G 20% /anon-root
	-/dev/ld0g 1.2T 749G 499G 60% /anon-root
	-/dev/ld0g 1.2T 1.2T 62G 95% /anon-root
	-/dev/ld0g 1.2T 1.2T 0B 100% /anon-root
	-/dev/ld0g 1.2T 0B 1.2T 0% /anon-root
	-/dev/ld0g 1.2T 250G 936G 21% /anon-root
	-/dev/ld0g 1.2T 749G 437G 63% /anon-root
	-/dev/ld0g 1.2T 1.2T 0B 100% /anon-root
	-/dev/ld0g 1.2T 1.2T -62G 105% /anon-root
	-/dev/ld0g 1.2T 0B 1.1T 0% /anon-root
	-/dev/ld0g 1.2T 250G 874G 22% /anon-root
	-/dev/ld0g 1.2T 749G 374G 66% /anon-root
	-/dev/ld0g 1.2T 1.2T -62G 105% /anon-root
	-/dev/ld0g 1.2T 1.2T -125G 111% /anon-root
	-/dev/ld0g 1.2T 0B 1.0T 0% /anon-root
	-/dev/ld0g 1.2T 250G 811G 23% /anon-root
	-/dev/ld0g 1.2T 749G 312G 70% /anon-root
	-/dev/ld0g 1.2T 1.2T -125G 111% /anon-root
	-/dev/ld0g 1.2T 1.2T -187G 117% /anon-root
	-/dev/strpct 20T 10T 10T 50% /strpct
	-/dev/wd0e 10G 2.7G 7.3G 27% /mount/windows/C
	+Filesystem Size Used Avail %Cap Mounted on
	+filer:/ 1.1T 132M 1.1T 1% /filer
	+filer:/ 1.1T 0B 1.1T 0% /filer
	+filer:/ 1.1T 229G 918G 21% /filer
	+filer:/ 1.1T 688G 459G 61% /filer
	+filer:/ 1.1T 1.1T 57G 96% /filer
	+filer:/ 1.1T 1.1T 0B 100% /filer
	+filer:/ 1.1T 0B 1.1T 0% /filer
	+filer:/ 1.1T 229G 860G 22% /filer
	+filer:/ 1.1T 688G 401G 64% /filer
	+filer:/ 1.1T 1.1T 0B 100% /filer
	+filer:/ 1.1T 1.1T -57G 106% /filer
	+filer:/ 1.1T 0B 1.0T 0% /filer
	+filer:/ 1.1T 229G 803G 23% /filer
	+filer:/ 1.1T 688G 344G 67% /filer
	+filer:/ 1.1T 1.1T -57G 106% /filer
	+filer:/ 1.1T 1.1T -115G 112% /filer
	+filer:/ 1.1T 0B 975G 0% /filer
	+filer:/ 1.1T 229G 746G 24% /filer
	+filer:/ 1.1T 688G 287G 71% /filer
	+filer:/ 1.1T 1.1T -115G 112% /filer
	+filer:/ 1.1T 1.1T -172G 118% /filer
	+/dev/ld0g 1.2T 17G 1.1T 2% /anon-root
	+/dev/ld0g 1.2T 0B 1.2T 0% /anon-root
	+/dev/ld0g 1.2T 250G 998G 21% /anon-root
	+/dev/ld0g 1.2T 749G 499G 61% /anon-root
	+/dev/ld0g 1.2T 1.2T 62G 96% /anon-root
	+/dev/ld0g 1.2T 1.2T 0B 100% /anon-root
	+/dev/ld0g 1.2T 0B 1.2T 0% /anon-root
	+/dev/ld0g 1.2T 250G 936G 22% /anon-root
	+/dev/ld0g 1.2T 749G 437G 64% /anon-root
	+/dev/ld0g 1.2T 1.2T 0B 100% /anon-root
	+/dev/ld0g 1.2T 1.2T -62G 106% /anon-root
	+/dev/ld0g 1.2T 0B 1.1T 0% /anon-root
	+/dev/ld0g 1.2T 250G 874G 23% /anon-root
	+/dev/ld0g 1.2T 749G 374G 67% /anon-root
	+/dev/ld0g 1.2T 1.2T -62G 106% /anon-root
	+/dev/ld0g 1.2T 1.2T -125G 112% /anon-root
	+/dev/ld0g 1.2T 0B 1.0T 0% /anon-root
	+/dev/ld0g 1.2T 250G 811G 24% /anon-root
	+/dev/ld0g 1.2T 749G 312G 71% /anon-root
	+/dev/ld0g 1.2T 1.2T -125G 112% /anon-root
	+/dev/ld0g 1.2T 1.2T -187G 118% /anon-root
	+/dev/strpct 20T 10T 10T 51% /strpct
	+/dev/wd0e 10G 2.7G 7.3G 28% /mount/windows/C
	EOF
	- atf_check -s eq:0 -o file:expout -e empty \
	+ atf_check -s exit:0 -o file:expout -e empty \
	-x "BLOCKSIZE=1k $(atf_get_srcdir)/h_df -hn"
	}

	diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
	--- a/etc/mtree/BSD.tests.dist
	+++ b/etc/mtree/BSD.tests.dist
	@@ -29,6 +29,8 @@
	..
	dd
	..
	+ df
	+ ..
	echo
	..
	expr

File Metadata

Mime Type: text/plain
Expires: Sun, Jan 25, 6:01 AM (14 h, 22 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 27834961
Default Alt Text: D54016.1769320861.diff (23 KB)

D54016.1769320861.diffNo OneTemporaryActions

D54016.1769320861.diffView Options

File Metadata

Event Timeline

D54016.1769320861.diff
No OneTemporary
Actions

D54016.1769320861.diff
View Options