Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 14 Jun 2015 20:52:52 +0000 (UTC)
From:      Garrett Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r284388 - in user/ngie/more-tests: bin/ls bin/ls/tests etc/mtree
Message-ID:  <201506142052.t5EKqqnp025741@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ngie
Date: Sun Jun 14 20:52:52 2015
New Revision: 284388
URL: https://svnweb.freebsd.org/changeset/base/284388

Log:
  Start adding tests for bin/ls

Added:
  user/ngie/more-tests/bin/ls/tests/
  user/ngie/more-tests/bin/ls/tests/Makefile   (contents, props changed)
  user/ngie/more-tests/bin/ls/tests/ls_tests.sh   (contents, props changed)
Modified:
  user/ngie/more-tests/bin/ls/Makefile
  user/ngie/more-tests/etc/mtree/BSD.tests.dist

Modified: user/ngie/more-tests/bin/ls/Makefile
==============================================================================
--- user/ngie/more-tests/bin/ls/Makefile	Sun Jun 14 20:23:41 2015	(r284387)
+++ user/ngie/more-tests/bin/ls/Makefile	Sun Jun 14 20:52:52 2015	(r284388)
@@ -13,4 +13,8 @@ CFLAGS+= -DCOLORLS
 LIBADD+=	termcapw xo
 .endif
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.prog.mk>

Added: user/ngie/more-tests/bin/ls/tests/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/ngie/more-tests/bin/ls/tests/Makefile	Sun Jun 14 20:52:52 2015	(r284388)
@@ -0,0 +1,8 @@
+TESTSDIR=	${TESTSBASE}/bin/ls
+
+ATF_TESTS_SH+=	ls_tests
+# This seems like overkill, but the idea in mind is that all of the testcases
+# should be runnable as !root
+TEST_METADATA.ls_tests+=	required_user="unprivileged"
+
+.include <bsd.test.mk>

Added: user/ngie/more-tests/bin/ls/tests/ls_tests.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/ngie/more-tests/bin/ls/tests/ls_tests.sh	Sun Jun 14 20:52:52 2015	(r284388)
@@ -0,0 +1,108 @@
+#
+# Copyright 2015 EMC Corp.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# * 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 COPYRIGHT HOLDERS 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 COPYRIGHT
+# OWNER 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$
+#
+
+create_test_inputs()
+{
+	ATF_TMPDIR=$(pwd)
+
+	# XXX: need to nest this because of how kyua creates $TMPDIR; otherwise
+	# it will run into EPERM issues later
+	TEST_INPUTS_DIR="${ATF_TMPDIR}/test/inputs"
+
+	atf_check -e empty -s exit:0 mkdir -m 0777 -p $TEST_INPUTS_DIR
+	cd $TEST_INPUTS_DIR
+	atf_check -e empty -s exit:0 mkdir -m 0755 -p a/b
+	atf_check -e empty -s exit:0 ln -s a/b c
+	atf_check -e empty -s exit:0 touch d
+	atf_check -e empty -s exit:0 ln d e
+	atf_check -e empty -s exit:0 touch .f
+	atf_check -e empty -s exit:0 mkdir .g
+	atf_check -e empty -s exit:0 mkfifo h
+}
+
+atf_test_case A_flag
+A_flag_head()
+{
+	atf_set "require.user" "unprivileged"
+}
+
+A_flag_body()
+{
+	create_test_inputs
+
+	WITH_A=$PWD/../with_A.out
+	WITHOUT_A=$PWD/../without_A.out
+
+	atf_check -e empty -o save:$WITH_A -s exit:0 ls -A
+	atf_check -e empty -o save:$WITHOUT_A -s exit:0 ls
+
+	echo "-A usage"
+	cat $WITH_A
+	echo "No -A usage"
+	cat $WITHOUT_A
+
+	for dot_path in '\.f' '\.g'; do
+		atf_check -e empty -o not-empty -s exit:0 grep "${dot_path}" \
+		    $WITH_A
+		atf_check -e empty -o empty -s not-exit:0 grep "${dot_path}" \
+		    $WITHOUT_A
+	done
+}
+
+atf_test_case A_flag_implied_when_root
+A_flag_implied_when_root_head()
+{
+	atf_set "descr" "Verify that -A is implied for root"
+	atf_set "require.user" "root"
+}
+
+A_flag_implied_when_root_body()
+{
+	create_test_inputs
+
+	WITH_EXPLICIT=$PWD/../with_explicit_A.out
+	WITH_IMPLIED=$PWD/../with_implied_A.out
+
+	atf_check -e empty -o save:$WITH_EXPLICIT -s exit:0 ls -A
+	atf_check -e empty -o save:$WITH_IMPLIED -s exit:0 ls
+
+	echo "Explicit -A usage"
+	cat $WITH_EXPLICIT
+	echo "Implicit -A usage"
+	cat $WITH_IMPLIED
+
+	atf_check_equal "$(cat $WITH_EXPLICIT)" "$(cat $WITH_IMPLIED)"
+}
+
+atf_init_test_cases()
+{
+
+	atf_add_test_case A_flag
+	atf_add_test_case A_flag_implied_when_root
+}

Modified: user/ngie/more-tests/etc/mtree/BSD.tests.dist
==============================================================================
--- user/ngie/more-tests/etc/mtree/BSD.tests.dist	Sun Jun 14 20:23:41 2015	(r284387)
+++ user/ngie/more-tests/etc/mtree/BSD.tests.dist	Sun Jun 14 20:52:52 2015	(r284388)
@@ -14,6 +14,8 @@
         ..
         expr
         ..
+        ls
+        ..
         mv
         ..
         pax



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