Merge pull request #8107 from cevich/measure_testing_stats

Cirrus: Collect runner.sh stats

2 files changed, 15 insertions, 0 deletions

diff --git a/contrib/cirrus/logcollector.sh b/contrib/cirrus/logcollector.sh
index 746bccec9..7bf651b36 100755
--- a/contrib/cirrus/logcollector.sh
+++ b/contrib/cirrus/logcollector.sh
@@ -76,5 +76,10 @@ case $1 in
         # Any not-present packages will be listed as such
         $PKG_LST_CMD "${PKG_NAMES[@]}" | sort -u
         ;;
+    time)
+        # Assumed to be empty/undefined outside of Cirrus-CI (.cirrus.yml)
+        # shellcheck disable=SC2154
+        if [[ -r "$STATS_LOGFILE" ]]; then cat "$STATS_LOGFILE"; fi
+        ;;
     *) die "Warning, $(basename $0) doesn't know how to handle the parameter '$1'"
 esac
diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh
index 330343e29..bf2b1a52b 100755
--- a/contrib/cirrus/runner.sh
+++ b/contrib/cirrus/runner.sh
@@ -260,6 +260,16 @@ dotest() {
         |& logformatter
 }
 
+# Nearly every task in .cirrus.yml makes use of this shell script
+# wrapped by /usr/bin/time to collect runtime statistics.  Because the
+# --output option is used to log stats to a file, every child-process
+# inherits an open FD3 pointing at the log.  However, some testing
+# operations depend on making use of FD3, and so it must be explicitly
+# closed here (and for all further child-processes).
+# STATS_LOGFILE assumed empty/undefined outside of Cirrus-CI (.cirrus.yml)
+# shellcheck disable=SC2154
+exec 3<&-
+
 msg "************************************************************"
 # Required to be defined by caller
 # shellcheck disable=SC2154