Module Name: src
Committed By: maya
Date: Wed Jan 17 00:23:17 UTC 2018
Modified Files:
src/tests/fs/tmpfs: t_sizes.sh t_statvfs.sh t_vnode_leak.sh
Log Message:
Use sysctl -n rather than parse the output.
>From Ngie Cooper in PR bin/51870
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/fs/tmpfs/t_sizes.sh
cvs rdiff -u -r1.4 -r1.5 src/tests/fs/tmpfs/t_statvfs.sh
cvs rdiff -u -r1.6 -r1.7 src/tests/fs/tmpfs/t_vnode_leak.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/tmpfs/t_sizes.sh
diff -u src/tests/fs/tmpfs/t_sizes.sh:1.5 src/tests/fs/tmpfs/t_sizes.sh:1.6
--- src/tests/fs/tmpfs/t_sizes.sh:1.5 Sun Nov 7 17:51:18 2010
+++ src/tests/fs/tmpfs/t_sizes.sh Wed Jan 17 00:23:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: t_sizes.sh,v 1.5 2010/11/07 17:51:18 jmmv Exp $
+# $NetBSD: t_sizes.sh,v 1.6 2018/01/17 00:23:17 maya Exp $
#
# Copyright (c) 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -54,7 +54,7 @@ big_head() {
big_body() {
test_mount -o -s10M
- pagesize=$(sysctl hw.pagesize | cut -d ' ' -f 3)
+ pagesize=$(sysctl -n hw.pagesize)
eval $($(atf_get_srcdir)/h_tools statvfs . | sed -e 's|^f_|cf_|')
cf_bused=$((${cf_blocks} - ${cf_bfree}))
Index: src/tests/fs/tmpfs/t_statvfs.sh
diff -u src/tests/fs/tmpfs/t_statvfs.sh:1.4 src/tests/fs/tmpfs/t_statvfs.sh:1.5
--- src/tests/fs/tmpfs/t_statvfs.sh:1.4 Sun Nov 7 17:51:18 2010
+++ src/tests/fs/tmpfs/t_statvfs.sh Wed Jan 17 00:23:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: t_statvfs.sh,v 1.4 2010/11/07 17:51:18 jmmv Exp $
+# $NetBSD: t_statvfs.sh,v 1.5 2018/01/17 00:23:17 maya Exp $
#
# Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -38,7 +38,7 @@ values_head() {
values_body() {
test_mount -o -s10M
- pagesize=$(sysctl hw.pagesize | cut -d ' ' -f 3)
+ pagesize=$(sysctl -n hw.pagesize)
eval $($(atf_get_srcdir)/h_tools statvfs .)
[ ${pagesize} -eq ${f_bsize} ] || \
atf_fail "Invalid bsize"
Index: src/tests/fs/tmpfs/t_vnode_leak.sh
diff -u src/tests/fs/tmpfs/t_vnode_leak.sh:1.6 src/tests/fs/tmpfs/t_vnode_leak.sh:1.7
--- src/tests/fs/tmpfs/t_vnode_leak.sh:1.6 Sun Nov 7 17:51:18 2010
+++ src/tests/fs/tmpfs/t_vnode_leak.sh Wed Jan 17 00:23:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: t_vnode_leak.sh,v 1.6 2010/11/07 17:51:18 jmmv Exp $
+# $NetBSD: t_vnode_leak.sh,v 1.7 2018/01/17 00:23:17 maya Exp $
#
# Copyright (c) 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -36,7 +36,7 @@ main_head() {
}
main_body() {
echo "Lowering kern.maxvnodes to 2000"
- sysctl kern.maxvnodes | awk '{ print $3; }' >oldvnodes
+ sysctl -n kern.maxvnodes >oldvnodes
atf_check -s eq:0 -o ignore -e empty sysctl -w kern.maxvnodes=2000
test_mount -o -s$(((4000 + 2) * 4096))
