svn commit: r326557 - in head: etc/mtree usr.bin usr.bin/sponge/tests

[Eitan Adler]

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"