Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 12 Jun 2017 07:43:58 +0000 (UTC)
From:      Ngie Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r319850 - in head: etc/mtree usr.bin/du usr.bin/du/tests
Message-ID:  <201706120743.v5C7hwx9049345@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ngie
Date: Mon Jun 12 07:43:58 2017
New Revision: 319850
URL: https://svnweb.freebsd.org/changeset/base/319850

Log:
  Add some initial basic tests for du(1)
  
  Tests that exercise the following flags are added in this commit:
  - -A
  - -H
  - -I
  - -g
  - -h
  - -k
  - -m
  
  Additional tests will be added soon.
  
  MFC after:	1 month

Added:
  head/usr.bin/du/tests/
  head/usr.bin/du/tests/Makefile   (contents, props changed)
  head/usr.bin/du/tests/du_test.sh   (contents, props changed)
Modified:
  head/etc/mtree/BSD.tests.dist
  head/usr.bin/du/Makefile

Modified: head/etc/mtree/BSD.tests.dist
==============================================================================
--- head/etc/mtree/BSD.tests.dist	Mon Jun 12 07:35:59 2017	(r319849)
+++ head/etc/mtree/BSD.tests.dist	Mon Jun 12 07:43:58 2017	(r319850)
@@ -628,6 +628,8 @@
         ..
         dirname
         ..
+        du
+        ..
         file2c
         ..
         getconf

Modified: head/usr.bin/du/Makefile
==============================================================================
--- head/usr.bin/du/Makefile	Mon Jun 12 07:35:59 2017	(r319849)
+++ head/usr.bin/du/Makefile	Mon Jun 12 07:43:58 2017	(r319850)
@@ -1,7 +1,11 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 PROG=	du
 LIBADD=	util
+
+SUBDIR.${MK_TESTS}+=	tests
 
 .include <bsd.prog.mk>

Added: head/usr.bin/du/tests/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/usr.bin/du/tests/Makefile	Mon Jun 12 07:43:58 2017	(r319850)
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+ATF_TESTS_SH+=	du_test
+
+.include <bsd.test.mk>

Added: head/usr.bin/du/tests/du_test.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/usr.bin/du/tests/du_test.sh	Mon Jun 12 07:43:58 2017	(r319850)
@@ -0,0 +1,153 @@
+#
+# Copyright (c) 2017 Ngie Cooper <ngie@FreeBSD.org>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+
+atf_test_case A_flag
+A_flag_head()
+{
+	atf_set "descr" "Verify -A behavior"
+}
+A_flag_body()
+{
+	# XXX: compressed volumes?
+	atf_check truncate -s 10g sparse.file
+	atf_check -o inline:'1\tsparse.file\n' du -g sparse.file
+	atf_check -o inline:'10\tsparse.file\n' du -A -g sparse.file
+}
+
+atf_test_case H_flag
+H_flag_head()
+{
+	atf_set "descr" "Verify -H behavior"
+}
+H_flag_body()
+{
+	local paths1='testdir/A/B testdir/A testdir/C testdir'
+	local paths2='testdir/A/B testdir/A testdir/C testdir'
+	local sep='\n[0-9]+\t'
+
+	atf_check mkdir testdir
+	atf_check -x "cd testdir && mkdir A && touch A/B && ln -s A C"
+
+	atf_check -o save:du.out du -aAH testdir
+	atf_check egrep -q "[0-9]+\t$(echo $paths1 | tr ' ' "$sep")\n" du.out
+	atf_check -o save:du_C.out du -aAH testdir/C
+	atf_check egrep -q "[0-9]+\t$(echo $paths2 | tr ' ' "$sep")\n" du_C.out
+}
+
+atf_test_case I_flag
+I_flag_head()
+{
+	atf_set "descr" "Verify -I behavior"
+}
+I_flag_body()
+{
+	paths_sans_foo_named="a/motley/fool/of/sorts fool/parts/with/their/cache bar baz"
+	paths_foo_named="foo foobar"
+	paths="$paths_sans_foo_named $paths_foo_named"
+
+	# cd'ing to testdir helps ensure that files from atf/kyua don't
+	# pollute the results.
+	atf_check -x "mkdir testdir && cd testdir && mkdir -p $paths"
+	atf_check -o save:du.out -x "cd testdir && du -s $paths_sans_foo_named"
+	atf_check -o save:du_I.out -x "cd testdir && du -I '*foo*' -s $paths"
+
+	atf_check diff -u du.out du_I.out
+}
+
+atf_test_case c_flag
+c_flag_head()
+{
+	atf_set	"descr" "Verify -c output"
+}
+c_flag_body()
+{
+	atf_check truncate -s 0 foo bar
+}
+
+atf_test_case g_flag
+g_flag_head()
+{
+	atf_set "descr" "Verify -g output"
+}
+g_flag_body()
+{
+	atf_check truncate -s 1k A
+	atf_check truncate -s 1m B
+	atf_check truncate -s 1g C
+	atf_check truncate -s 1t D
+	atf_check -o inline:'1\tA\n1\tB\n1\tC\n1024\tD\n' du -Ag A B C D
+}
+
+atf_test_case h_flag
+h_flag_head()
+{
+	atf_set	"descr" "Verify -h output"
+}
+h_flag_body()
+{
+	atf_check truncate -s 1k A
+	atf_check truncate -s 1m B
+	atf_check truncate -s 1g C
+	atf_check truncate -s 1t D
+	atf_check -o inline:'1.0K\tA\n1.0M\tB\n1.0G\tC\n1.0T\tD\n' du -Ah A B C D
+}
+
+atf_test_case k_flag
+k_flag_head()
+{
+	atf_set "descr" "Verify -k output"
+}
+k_flag_body()
+{
+	atf_check truncate -s 1k A
+	atf_check truncate -s 1m B
+	atf_check -o inline:'1\tA\n1024\tB\n' du -Ak A B
+}
+
+atf_test_case m_flag
+m_flag_head()
+{
+	atf_set "descr" "Verify -m output"
+}
+m_flag_body()
+{
+	atf_check truncate -s 1k A
+	atf_check truncate -s 1m B
+	atf_check truncate -s 1g C
+	atf_check -o inline:'1\tA\n1\tB\n1024\tC\n' du -Am A B C
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case A_flag
+	atf_add_test_case H_flag
+	atf_add_test_case I_flag
+	atf_add_test_case g_flag
+	atf_add_test_case h_flag
+	atf_add_test_case k_flag
+	atf_add_test_case m_flag
+}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706120743.v5C7hwx9049345>