From owner-svn-src-all@freebsd.org  Tue Dec  5 04:43:41 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 5F562DF3F4F;
 Tue,  5 Dec 2017 04:43:41 +0000 (UTC)
 (envelope-from eadler@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 2BB8C6A404;
 Tue,  5 Dec 2017 04:43:41 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vB54heus095192;
 Tue, 5 Dec 2017 04:43:40 GMT (envelope-from eadler@FreeBSD.org)
Received: (from eadler@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB54hdGf095188;
 Tue, 5 Dec 2017 04:43:39 GMT (envelope-from eadler@FreeBSD.org)
Message-Id: <201712050443.vB54hdGf095188@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: eadler set sender to
 eadler@FreeBSD.org using -f
From: Eitan Adler <eadler@FreeBSD.org>
Date: Tue, 5 Dec 2017 04:43:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r326557 - in head: etc/mtree usr.bin usr.bin/sponge/tests
X-SVN-Group: head
X-SVN-Commit-Author: eadler
X-SVN-Commit-Paths: in head: etc/mtree usr.bin usr.bin/sponge/tests
X-SVN-Commit-Revision: 326557
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Dec 2017 04:43:41 -0000

Author: eadler
Date: Tue Dec  5 04:43:39 2017
New Revision: 326557
URL: https://svnweb.freebsd.org/changeset/base/326557

Log:
  sponge(1): fix my tests
  
  Reviewed by:	kevans

Modified:
  head/etc/mtree/BSD.tests.dist
  head/usr.bin/Makefile
  head/usr.bin/sponge/tests/Makefile
  head/usr.bin/sponge/tests/sponge_test.sh

Modified: head/etc/mtree/BSD.tests.dist
==============================================================================
--- head/etc/mtree/BSD.tests.dist	Tue Dec  5 04:22:35 2017	(r326556)
+++ head/etc/mtree/BSD.tests.dist	Tue Dec  5 04:43:39 2017	(r326557)
@@ -712,6 +712,8 @@
         ..
         soelim
         ..
+        sponge
+        ..
         stat
         ..
         tail

Modified: head/usr.bin/Makefile
==============================================================================
--- head/usr.bin/Makefile	Tue Dec  5 04:22:35 2017	(r326556)
+++ head/usr.bin/Makefile	Tue Dec  5 04:43:39 2017	(r326557)
@@ -148,6 +148,7 @@ SUBDIR=	alias \
 	soelim \
 	sort \
 	split \
+	sponge \
 	stat \
 	stdbuf \
 	strings \

Modified: head/usr.bin/sponge/tests/Makefile
==============================================================================
--- head/usr.bin/sponge/tests/Makefile	Tue Dec  5 04:22:35 2017	(r326556)
+++ head/usr.bin/sponge/tests/Makefile	Tue Dec  5 04:43:39 2017	(r326557)
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
-PACKAGE=	${TESTBASE}/usr.bin/sponge
+PACKAGE=	tests
 
-TESTSDIR=	${TESTSBASE}/usr.bin/sponge/tests
+TESTSDIR=	${TESTSBASE}/usr.bin/sponge
 
-ATF_TESTS_SH=	cp_test
+ATF_TESTS_SH=	sponge_test
 
 .include <bsd.test.mk>

Modified: head/usr.bin/sponge/tests/sponge_test.sh
==============================================================================
--- head/usr.bin/sponge/tests/sponge_test.sh	Tue Dec  5 04:22:35 2017	(r326556)
+++ head/usr.bin/sponge/tests/sponge_test.sh	Tue Dec  5 04:43:39 2017	(r326557)
@@ -33,7 +33,7 @@ simple_body() {
   printf 'a\nd\ne\n' >| y
   sort x | sponge x
 
-  atf_check -s exit:0 -o empty -e empty 'sort x | sponge x'
+  atf_check -s exit:0 -o empty -e empty -x 'sort x | sponge x'
 
   if ! cmp -s x y; then
     echo "x and y differ, but they should be equal"