From owner-svn-src-all@freebsd.org Mon Oct 26 03:15:08 2015 Return-Path: Delivered-To: svn-src-all@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 588AF8475; Mon, 26 Oct 2015 03:15:08 +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 0AD481A4E; Mon, 26 Oct 2015 03:15:07 +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 t9Q3F7RB099725; Mon, 26 Oct 2015 03:15:07 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9Q3F6LQ099722; Mon, 26 Oct 2015 03:15:06 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201510260315.t9Q3F6LQ099722@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Mon, 26 Oct 2015 03:15:06 +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: r289981 - in stable/10: etc/mtree usr.bin/col usr.bin/col/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-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Oct 2015 03:15:08 -0000 Author: ngie Date: Mon Oct 26 03:15:06 2015 New Revision: 289981 URL: https://svnweb.freebsd.org/changeset/base/289981 Log: MFC r282339,r282341: r282339 (by bapt): Add regression test about reverse line feed to col(1) r282341 (by bapt): Actually push the right tests Added: stable/10/usr.bin/col/tests/ - copied from r282339, head/usr.bin/col/tests/ Modified: stable/10/etc/mtree/BSD.tests.dist stable/10/usr.bin/col/Makefile stable/10/usr.bin/col/tests/col.sh Directory Properties: stable/10/ (props changed) Modified: stable/10/etc/mtree/BSD.tests.dist ============================================================================== --- stable/10/etc/mtree/BSD.tests.dist Mon Oct 26 02:21:32 2015 (r289980) +++ stable/10/etc/mtree/BSD.tests.dist Mon Oct 26 03:15:06 2015 (r289981) @@ -340,6 +340,8 @@ .. cmp .. + col + .. comm .. cut Modified: stable/10/usr.bin/col/Makefile ============================================================================== --- stable/10/usr.bin/col/Makefile Mon Oct 26 02:21:32 2015 (r289980) +++ stable/10/usr.bin/col/Makefile Mon Oct 26 03:15:06 2015 (r289981) @@ -1,6 +1,12 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ +.include + PROG= col +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include Modified: stable/10/usr.bin/col/tests/col.sh ============================================================================== --- head/usr.bin/col/tests/col.sh Sat May 2 12:08:28 2015 (r282339) +++ stable/10/usr.bin/col/tests/col.sh Mon Oct 26 03:15:06 2015 (r289981) @@ -15,22 +15,16 @@ rlf_body() col < $(atf_get_srcdir)/rlf.in atf_check \ - -o inline:"a b3\n" \ + -o inline:"a b\n" \ -e empty \ -s exit:0 \ col < $(atf_get_srcdir)/rlf2.in atf_check \ - -o inline:"a b3\n" \ + -o inline:"a b\n" \ -e empty \ -s exit:0 \ col -x < $(atf_get_srcdir)/rlf2.in - - atf_check \ - -o inline:"a b3\n" \ - -e empty \ - -s exit:0 \ - col -p < $(atf_get_srcdir)/rlf2.in } atf_init_test_cases()