From owner-svn-src-user@freebsd.org  Fri Oct  2 08:13:46 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 ACACCA0EEA9
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Fri,  2 Oct 2015 08:13:46 +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 966F6180A;
 Fri,  2 Oct 2015 08:13:46 +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 t928DkEZ074853;
 Fri, 2 Oct 2015 08:13:46 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t928DkFt074852;
 Fri, 2 Oct 2015 08:13:46 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201510020813.t928DkFt074852@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: Fri, 2 Oct 2015 08:13:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r288480 - 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: Fri, 02 Oct 2015 08:13:46 -0000

Author: ngie
Date: Fri Oct  2 08:13:45 2015
New Revision: 288480
URL: https://svnweb.freebsd.org/changeset/base/288480

Log:
  Add a testcase to test ls -s; remove an unnecessary sync

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	Fri Oct  2 07:26:24 2015	(r288479)
+++ user/ngie/more-tests/bin/ls/tests/ls_tests.sh	Fri Oct  2 08:13:45 2015	(r288480)
@@ -304,9 +304,31 @@ q_flag_and_w_flag_body()
 	atf_check -e empty -o match:"$test_file" -s exit:0 ls -w "$test_file"
 }
 
+s_flag_head()
+{
+	atf_set "descr" "Verify that the output from ls -s matches the output from stat(1)"
+}
+
+s_flag_body()
+{
+	create_test_dir
+
+	for filesize in 512 1 2048 10240 $(( 512 * 1024 )); do
+		atf_check -e ignore -o empty -s exit:0 \
+		    dd if=/dev/zero of=${filesize}.file bs=${filesize} count=1
+		files="${files} ${filesize}.file"
+	done
+
+	for file in $files; do
+		atf_check -e empty \
+		    -o match:"$(stat -f "%b" $file)[[:space:]]+$file" ls -s $file
+		stat -f "%b" $file
+	done
+}
+
 t_flag_head()
 {
-	atf_set "descr" "Verify that the output from ls -u sorts by last access with -t"
+	atf_set "descr" "Verify that the output from ls -t sorts by modification time"
 }
 
 t_flag_body()
@@ -314,7 +336,6 @@ t_flag_body()
 	create_test_dir
 
 	atf_check -e empty -o empty -s exit:0 touch a.file
-	sync
 	atf_check -e empty -o empty -s exit:0 touch b.file
 	sync
 
@@ -461,7 +482,7 @@ atf_init_test_cases()
 	#atf_add_test_case p_flag
 	atf_add_test_case q_flag_and_w_flag
 	#atf_add_test_case r_flag
-	#atf_add_test_case s_flag
+	atf_add_test_case s_flag
 	atf_add_test_case t_flag
 	atf_add_test_case u_flag
 	atf_add_test_case x_flag