From f54f69008fd0a3bf2768a83a1757ca83bfbea2d4 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Sat, 3 Jun 2017 18:10:04 +0000 Subject: 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 --- usr.sbin/newsyslog/tests/legacy_test.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'usr.sbin/newsyslog') diff --git a/usr.sbin/newsyslog/tests/legacy_test.sh b/usr.sbin/newsyslog/tests/legacy_test.sh index fb2d957e19da..342ae58d431a 100644 --- a/usr.sbin/newsyslog/tests/legacy_test.sh +++ b/usr.sbin/newsyslog/tests/legacy_test.sh @@ -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'` -- cgit v1.2.3