svn commit: r305011 - head/usr.sbin/newsyslog/tests

[Ngie Cooper]

Author: ngie
Date: Mon Aug 29 18:46:04 2016
New Revision: 305011
URL: https://svnweb.freebsd.org/changeset/base/305011

Log:
  Expect sub testcases 2-4 in :tests_time_rotate to fail today due to changes
  to newsyslog, etc made in the past month.
  
  The issue is being root-caused as part of the bug noted below. This commit
  will need to be partially reverted once the issue has been found/fixed
  
  PR:		212160
  Reported by:	Jenkins
  Sponsored by:	EMC / Isilon Storage Division

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	Mon Aug 29 18:41:06 2016	(r305010)
+++ head/usr.sbin/newsyslog/tests/legacy_test.sh	Mon Aug 29 18:46:04 2016	(r305011)
@@ -20,13 +20,22 @@ begin()
 # End an individual test
 end()
 {
+	local message
+
 	if [ $OK = 1 ]
 	then
-		printf 'ok '
+		message='ok '
 	else
-		printf 'not ok '
+		message='not ok '
+	fi
+
+	message="$message $COUNT - $NAME"
+	if [ -n "$TODO" ]
+	then
+		message="$message # TODO $TODO"
 	fi
-	echo "$COUNT - $NAME"
+
+	echo "$message"
 }
 
 # Make a file that can later be verified
@@ -336,6 +345,9 @@ tests_time_rotate() {
 
 	sleep 1.1
 
+	(
+	TODO="rotate time 2-4 fail today; bug 212160"
+
 	begin "rotate time 2 ${name_postfix}"
 	run_newsyslog ${newsyslog_args}
 	ckfe ${LOGFNAME}
@@ -357,6 +369,7 @@ tests_time_rotate() {
 	ckfe ${LOGFNAME}
 	chkfcnt 3 ${dir}${LOGFNAME}.*${ext}
 	end
+	)
 
 	begin "noaction ${name_postfix}"
 	ofiles=`ls -1 ${dir}${LOGFNAME}.*${ext} | tr -d '\n'`