From owner-svn-src-stable@freebsd.org Tue Feb 21 02:18:46 2017 Return-Path: Delivered-To: svn-src-stable@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 A2C09CE7AF7; Tue, 21 Feb 2017 02:18:46 +0000 (UTC) (envelope-from ngie@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 54E891F23; Tue, 21 Feb 2017 02:18:46 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1L2IjpH011761; Tue, 21 Feb 2017 02:18:45 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1L2IjUp011759; Tue, 21 Feb 2017 02:18:45 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201702210218.v1L2IjUp011759@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Tue, 21 Feb 2017 02:18:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314004 - in stable/10: contrib/netbsd-tests/usr.bin/sed usr.bin/sed/tests X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Feb 2017 02:18:46 -0000 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 .include