From 8d4a7aab4020ba49852baa2367b335bfaeca9fc2 Mon Sep 17 00:00:00 2001 From: Eitan Adler Date: Tue, 5 Dec 2017 04:43:39 +0000 Subject: [PATCH] sponge(1): fix my tests Reviewed by: kevans --- etc/mtree/BSD.tests.dist | 2 ++ usr.bin/Makefile | 1 + usr.bin/sponge/tests/Makefile | 6 +++--- usr.bin/sponge/tests/sponge_test.sh | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index d025fbf62fc5..cb35fa3b337f 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -712,6 +712,8 @@ .. soelim .. + sponge + .. stat .. tail diff --git a/usr.bin/Makefile b/usr.bin/Makefile index b4c24640b6d3..8aadb9f604ea 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -148,6 +148,7 @@ SUBDIR= alias \ soelim \ sort \ split \ + sponge \ stat \ stdbuf \ strings \ diff --git a/usr.bin/sponge/tests/Makefile b/usr.bin/sponge/tests/Makefile index f247b8bacdd0..9e325fcf28a6 100644 --- a/usr.bin/sponge/tests/Makefile +++ b/usr.bin/sponge/tests/Makefile @@ -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 diff --git a/usr.bin/sponge/tests/sponge_test.sh b/usr.bin/sponge/tests/sponge_test.sh index feb1715751ee..2fe81f15c31c 100755 --- a/usr.bin/sponge/tests/sponge_test.sh +++ b/usr.bin/sponge/tests/sponge_test.sh @@ -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"