summaryrefslogtreecommitdiffstats
path: root/usr.bin/sed
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2017-02-23 06:28:41 -0300
committerRenato Botelho <renato@netgate.com>2017-02-23 06:28:41 -0300
commit82ceeb2ea625cd9bff60f2863b9a0830f55b7905 (patch)
tree263ca9347bf664a4489743f9302e699ce14de1df /usr.bin/sed
parent4a05f5440acda223e6a0ec5157bc32ecc0f09ff9 (diff)
parentd20dd8b36e7a565be7bfbb22aade51c8ffd753e9 (diff)
downloadFreeBSD-src-devel.zip
FreeBSD-src-devel.tar.gz
Merge remote-tracking branch 'origin/stable/10' into develdevel
Diffstat (limited to 'usr.bin/sed')
-rw-r--r--usr.bin/sed/tests/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.bin/sed/tests/Makefile b/usr.bin/sed/tests/Makefile
index 02d2b89..5bceaf8 100644
--- a/usr.bin/sed/tests/Makefile
+++ b/usr.bin/sed/tests/Makefile
@@ -1,7 +1,6 @@
# $FreeBSD$
-TESTSDIR= ${TESTSBASE}/usr.bin/sed
-
+NETBSD_ATF_TESTS_SH+= sed_test
TAP_TESTS_SH= legacy_test
TAP_TESTS_SH+= multi_test
TEST_METADATA.multi_test+= required_files="/usr/share/dict/words"
@@ -33,7 +32,10 @@ FILES+= regress.s5.out
FILES+= regress.sg.out
FILES+= regress.sh
FILES+= regress.y.out
+ATF_TESTS_SH_SED_sed_test+= -e 's,atf_expect_fail "PR bin/28126",,g'
+FILES+= d_c2048.in
SUBDIR= regress.multitest.out
+.include <netbsd-tests.test.mk>
.include <bsd.test.mk>
OpenPOWER on IntegriCloud