From 21b103f6920ede5ff1f45b76ecaddea3a522fc70 Mon Sep 17 00:00:00 2001
From: Joel Martin <github@martintribe.org>
Date: Fri, 23 Apr 2021 17:03:09 -0500
Subject: [PATCH] ci.sh: log all output to prefixed log.

Log file name: ./ACTION[-regress]-IMPL[-MODE].log

Also debug file name is same format but with ".debug" instead of
".log" suffix.
---
 ci.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ci.sh b/ci.sh
index 4c0fdab9..b0b8a9dd 100755
--- a/ci.sh
+++ b/ci.sh
@@ -7,8 +7,6 @@ IMPL=${2}
 
 # Environment variable configuration
 BUILD_IMPL=${BUILD_IMPL:-${IMPL}}
-log_prefix="../../${IMPL}-${ACTION}${REGRESS:+-regress}"
-TEST_OPTS="${TEST_OPTS} --log-file ${log_prefix}.log --debug-file ${log_prefix}.debug"
 
 if [ "${DO_SELF_HOST}" ]; then
     MAL_IMPL=${IMPL}
@@ -41,6 +39,12 @@ mode_var=${raw_mode_var/-/__}
 mode_var=${mode_var/./__}
 mode_val=${!mode_var}
 
+log_prefix="${ACTION}${REGRESS:+-regress}-${IMPL}${mode_val:+-${mode_val}}"
+TEST_OPTS="${TEST_OPTS} --debug-file ../../${log_prefix}.debug"
+
+# Log everything below this point:
+exec &> >(tee ./${log_prefix}.log)
+
 MAKE="make ${mode_val:+${mode_var}=${mode_val}}"
 
 # If NO_DOCKER is blank then launch use a docker image, otherwise use