From owner-svn-src-head@freebsd.org  Sat Jun  3 18:10:05 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 59C02BF6830;
 Sat,  3 Jun 2017 18:10:05 +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 27ADF78DAA;
 Sat,  3 Jun 2017 18:10:05 +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 v53IA47b049948;
 Sat, 3 Jun 2017 18:10:04 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v53IA47S049947;
 Sat, 3 Jun 2017 18:10:04 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201706031810.v53IA47S049947@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Sat, 3 Jun 2017 18:10:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r319545 - head/usr.sbin/newsyslog/tests
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Jun 2017 18:10:05 -0000

Author: ngie
Date: Sat Jun  3 18:10:04 2017
New Revision: 319545
URL: https://svnweb.freebsd.org/changeset/base/319545

Log:
  Don't execute the TODO cases in a subshell
  
  This messes up the testcase counter, as seen in bug 219756.
  
  PR:		212160, 219756
  Sponsored by:	Dell EMC Isilon

Modified:
  head/usr.sbin/newsyslog/tests/legacy_test.sh

Modified: head/usr.sbin/newsyslog/tests/legacy_test.sh
==============================================================================
--- head/usr.sbin/newsyslog/tests/legacy_test.sh	Sat Jun  3 17:59:10 2017	(r319544)
+++ head/usr.sbin/newsyslog/tests/legacy_test.sh	Sat Jun  3 18:10:04 2017	(r319545)
@@ -380,7 +380,6 @@ tests_time_rotate() {
 
 	sleep 1.1
 
-	(
 	TODO="rotate time 2-4 fail today; bug 212160"
 
 	begin "rotate time 2 ${name_postfix}"
@@ -404,7 +403,7 @@ tests_time_rotate() {
 	ckfe ${LOGFNAME}
 	chkfcnt 3 ${dir}${LOGFNAME}.*${ext}
 	end
-	)
+	unset TODO
 
 	begin "noaction ${name_postfix}"
 	ofiles=`ls -1 ${dir}${LOGFNAME}.*${ext} | tr -d '\n'`