From owner-svn-src-user@freebsd.org  Mon Sep 28 01:17:32 2015
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 57BF8A0B4ED
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Mon, 28 Sep 2015 01:17:32 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::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 4923D2BA;
 Mon, 28 Sep 2015 01:17:32 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8S1HWbf087539;
 Mon, 28 Sep 2015 01:17:32 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8S1HWLK087538;
 Mon, 28 Sep 2015 01:17:32 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201509280117.t8S1HWLK087538@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Mon, 28 Sep 2015 01:17:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r288321 - user/ngie/more-tests/bin/ls/tests
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Sep 2015 01:17:32 -0000

Author: ngie
Date: Mon Sep 28 01:17:31 2015
New Revision: 288321
URL: https://svnweb.freebsd.org/changeset/base/288321

Log:
  Add -C and -1 testcases

Modified:
  user/ngie/more-tests/bin/ls/tests/ls_tests.sh

Modified: user/ngie/more-tests/bin/ls/tests/ls_tests.sh
==============================================================================
--- user/ngie/more-tests/bin/ls/tests/ls_tests.sh	Mon Sep 28 01:16:44 2015	(r288320)
+++ user/ngie/more-tests/bin/ls/tests/ls_tests.sh	Mon Sep 28 01:17:31 2015	(r288321)
@@ -99,6 +99,19 @@ A_flag_implied_when_root_body()
 	atf_check_equal "$(cat $WITH_EXPLICIT)" "$(cat $WITH_IMPLIED)"
 }
 
+atf_test_case C_flag
+C_flag_head()
+{
+	atf_set "descr" "Verify that the output from ls -C"
+}
+
+C_flag_body()
+{
+	create_test_inputs
+
+	atf_check -e empty -o match:"$(printf 'a[[:space:]]+c[[:space:]]+d[[:space:]]+e[[:space:]]+h\n')" -s exit:0 ls -C
+}
+
 atf_test_case I_flag
 I_flag_head()
 {
@@ -141,11 +154,37 @@ I_flag_voids_A_flag_when_root_body()
 	atf_check -o match:'\.g' -s exit:0 ls -A -I
 }
 
+1_flag_head()
+{
+	atf_set "descr" "Verify that -1 prints out one item per line"
+}
+
+1_flag_body()
+{
+	create_test_inputs
+
+	WITH_1=$PWD/../with_1.out
+	WITHOUT_1=$PWD/../without_1.out
+
+	atf_check -e empty -o save:$WITH_1 -s exit:0 ls -1
+	atf_check -e empty -o save:$WITHOUT_1 -s exit:0 \
+		sh -c 'for i in $(ls); do echo $i; done'
+
+	echo "Explicit -1 usage"
+	cat $WITH_1
+	echo "No -1 usage"
+	cat $WITHOUT_1
+
+	atf_check_equal "$(cat $WITH_1)" "$(cat $WITHOUT_1)"
+}
+
 atf_init_test_cases()
 {
 
 	atf_add_test_case A_flag
 	atf_add_test_case A_flag_implied_when_root
+	atf_add_test_case C_flag
 	atf_add_test_case I_flag
 	atf_add_test_case I_flag_voids_A_flag_when_root
+	atf_add_test_case 1_flag
 }