From owner-svn-src-head@freebsd.org Tue Sep 20 16:31:58 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CCCB4BE21C0; Tue, 20 Sep 2016 16:31:58 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 99E66B6E; Tue, 20 Sep 2016 16:31:58 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8KGVvXQ090455; Tue, 20 Sep 2016 16:31:57 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8KGVvuT090453; Tue, 20 Sep 2016 16:31:57 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201609201631.u8KGVvuT090453@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Tue, 20 Sep 2016 16:31:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r306033 - head/contrib/netbsd-tests/fs/tmpfs X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Sep 2016 16:31:58 -0000 Author: ngie Date: Tue Sep 20 16:31:57 2016 New Revision: 306033 URL: https://svnweb.freebsd.org/changeset/base/306033 Log: Port sizes_test and statvfs_test to FreeBSD Similar to r306030, use a simpler method for getting the value of `hw.pagesize`, i.e. `sysctl -n hw.pagesize`. The awk filtering method doesn't work on FreeBSD MFC after: 1 month Sponsored by: Dell EMC Isilon Modified: head/contrib/netbsd-tests/fs/tmpfs/t_sizes.sh head/contrib/netbsd-tests/fs/tmpfs/t_statvfs.sh Modified: head/contrib/netbsd-tests/fs/tmpfs/t_sizes.sh ============================================================================== --- head/contrib/netbsd-tests/fs/tmpfs/t_sizes.sh Tue Sep 20 16:30:59 2016 (r306032) +++ head/contrib/netbsd-tests/fs/tmpfs/t_sizes.sh Tue Sep 20 16:31:57 2016 (r306033) @@ -54,7 +54,15 @@ big_head() { big_body() { test_mount -o -s10M + # Begin FreeBSD + if true; then + pagesize=$(sysctl -n hw.pagesize) + else + # End FreeBSD pagesize=$(sysctl hw.pagesize | cut -d ' ' -f 3) + # Begin FreeBSD + fi + # End FreeBSD eval $($(atf_get_srcdir)/h_tools statvfs . | sed -e 's|^f_|cf_|') cf_bused=$((${cf_blocks} - ${cf_bfree})) Modified: head/contrib/netbsd-tests/fs/tmpfs/t_statvfs.sh ============================================================================== --- head/contrib/netbsd-tests/fs/tmpfs/t_statvfs.sh Tue Sep 20 16:30:59 2016 (r306032) +++ head/contrib/netbsd-tests/fs/tmpfs/t_statvfs.sh Tue Sep 20 16:31:57 2016 (r306033) @@ -38,7 +38,15 @@ values_head() { values_body() { test_mount -o -s10M + # Begin FreeBSD + if true; then + pagesize=$(sysctl -n hw.pagesize) + else + # End FreeBSD pagesize=$(sysctl hw.pagesize | cut -d ' ' -f 3) + # Begin FreeBSD + fi + # End FreeBSD eval $($(atf_get_srcdir)/h_tools statvfs .) [ ${pagesize} -eq ${f_bsize} ] || \ atf_fail "Invalid bsize"