svn commit: r314004 - in stable/10: contrib/netbsd-tests/usr.bin/sed usr.bin/sed/tests

[Ngie Cooper]

Author: ngie
Date: Tue Feb 21 02:18:45 2017
New Revision: 314004
URL: https://svnweb.freebsd.org/changeset/base/314004

Log:
  MFC r312520:
  
  Integrate contrib/netbsd-tests/usr.bin/sed/t_sed.sh into the FreeBSD test
  suite as usr.bin/sed/sed_test
  
  Don't expect :emptybackref to fail -- it succeeds on FreeBSD
  
  Expect :preserve_leading_ws_ia to fail -- it fails on ^/stable/10, but not on
  ^/stable/11 or ^/head

Modified:
  stable/10/contrib/netbsd-tests/usr.bin/sed/t_sed.sh
  stable/10/usr.bin/sed/tests/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/netbsd-tests/usr.bin/sed/t_sed.sh
==============================================================================
--- stable/10/contrib/netbsd-tests/usr.bin/sed/t_sed.sh	Tue Feb 21 02:15:58 2017	(r314003)
+++ stable/10/contrib/netbsd-tests/usr.bin/sed/t_sed.sh	Tue Feb 21 02:18:45 2017	(r314004)
@@ -126,6 +126,8 @@ preserve_leading_ws_ia_head() {
 }
 
 preserve_leading_ws_ia_body() {
+	atf_expect_fail "fails on ^/stable/10"
+
 	atf_check -o inline:"    1 2 3\n4 5 6\n    7 8 9\n\n" \
 		-x 'echo | sed -e "/^$/i\\
     1 2 3\\

Modified: stable/10/usr.bin/sed/tests/Makefile
==============================================================================
--- stable/10/usr.bin/sed/tests/Makefile	Tue Feb 21 02:15:58 2017	(r314003)
+++ stable/10/usr.bin/sed/tests/Makefile	Tue Feb 21 02:18:45 2017	(r314004)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+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"
@@ -31,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>