From: Josef Bacik <josef@toxicpanda.com>
Date: Tue, 15 Sep 2020 00:22:43 +0000 (-0400)
Subject: fstests: drop check.log and check.time into section specific results dir
X-Git-Tag: v2022.05.01~639
X-Git-Url: http://git.apps.os.sepia.ceph.com/?p=xfstests-dev.git;a=commitdiff_plain;h=61e4eead3cf4810fcb1dd7fc5c84742569bd70f8

fstests: drop check.log and check.time into section specific results dir

Right now we only track check.log and check.time globally, it would
be nice to do it per-section as well.  This makes it easier to parse
results from systems that run a bunch of different configurations at
once.

Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
---

diff --git a/check b/check
index 415e0ff3..8b5e241c 100755
--- a/check
+++ b/check
@@ -391,6 +391,13 @@ _wipe_counters()
 	unset try notrun bad
 }
 
+_global_log() {
+	echo "$1" >> $check.log
+	if $OPTIONS_HAVE_SECIONS; then
+		echo "$1" >> ${REPORT_DIR}/check.log
+	fi
+}
+
 _wrapup()
 {
 	seq="check"
@@ -415,10 +422,13 @@ _wrapup()
 				}' \
 				| sort -n >$tmp.out
 			mv $tmp.out $check.time
+			if $OPTIONS_HAVE_SECTIONS; then
+				cp $check.time ${REPORT_DIR}/check.time
+			fi
 		fi
 
-		echo "" >>$check.log
-		date >>$check.log
+		_global_log ""
+		_global_log "$(date)"
 
 		echo "SECTION       -- $section" >>$tmp.summary
 		echo "=========================" >>$tmp.summary
@@ -427,29 +437,33 @@ _wrapup()
 				echo "Ran:$try"
 				echo "Ran:$try" >>$tmp.summary
 			fi
-			echo "Ran:$try" >>$check.log
+			_global_log "Ran:$try"
 		fi
 
 		$interrupt && echo "Interrupted!" | tee -a $check.log
+		if $OPTIONS_HAVE_SECIONS; then
+			$interrupt && echo "Interrupted!" | tee -a \
+				${REPORT_DIR}/check.log
+		fi
 
 		if [ ! -z "$notrun" ]; then
 			if [ $brief_test_summary == "false" ]; then
 				echo "Not run:$notrun"
 				echo "Not run:$notrun" >>$tmp.summary
 			fi
-			echo "Not run:$notrun" >>$check.log
+			_global_log "Not run:$notrun"
 		fi
 
 		if [ ! -z "$n_bad" -a $n_bad != 0 ]; then
 			echo "Failures:$bad"
 			echo "Failed $n_bad of $n_try tests"
-			echo "Failures:$bad" >>$check.log
-			echo "Failed $n_bad of $n_try tests" >>$check.log
+			_global_log "Failures:$bad"
+			_global_log "Failed $n_bad of $n_try tests"
 			echo "Failures:$bad" >>$tmp.summary
 			echo "Failed $n_bad of $n_try tests" >>$tmp.summary
 		else
 			echo "Passed all $n_try tests"
-			echo "Passed all $n_try tests" >>$check.log
+			_global_log "Passed all $n_try tests"
 			echo "Passed all $n_try tests" >>$tmp.summary
 		fi
 		echo "" >>$tmp.summary