Fixing test-setup.sh occasionally missing stdout/stderr, on systems where "tail --pid" is supported.

The solutions aren't mine, the new test was taken from Ola's unknown commit and the way to avoid race condition courtesy of sethkoehler@

Mitigates #4608 for compatible Linux systems.

TESTED=manual scripts and new test case.
RELNOTES: None
PiperOrigin-RevId: 185374273

1 files changed, 23 insertions, 3 deletions

diff --git a/tools/test/test-setup.sh b/tools/test/test-setup.sh
index aa6f7223b8..328972fe6a 100755
--- a/tools/test/test-setup.sh
+++ b/tools/test/test-setup.sh
@@ -218,10 +218,30 @@ for signal in $signals; do
 done
 start=$(date +%s)
 
-if [ -z "$COVERAGE_DIR" ]; then
-  "${TEST_PATH}" "$@" 2> >(tee -a "${XML_OUTPUT_FILE}.log" >&2) 1> >(tee -a "${XML_OUTPUT_FILE}.log") 2>&1 || exitCode=$?
+# Check if we have tail --pid option
+dummy=1 &
+pid=$!
+has_tail=true
+tail -fq --pid $pid -s 0.001 /dev/null &> /dev/null || has_tail=false
+
+if [ "$has_tail" == true ] && [  -z "$no_echo" ]; then
+  touch "${XML_OUTPUT_FILE}.log"
+  if [ -z "$COVERAGE_DIR" ]; then
+    "${TEST_PATH}" "$@" &>"${XML_OUTPUT_FILE}.log" &
+    pid=$!
+  else
+    "$1" "$TEST_PATH" "${@:3}" &> "${XML_OUTPUT_FILE}.log" &
+    pid=$!
+  fi
+  tail -fq --pid $pid -s 0.001 "${XML_OUTPUT_FILE}.log"
+  wait $pid
+  exitCode=$?
 else
-  "$1" "$TEST_PATH" "${@:3}" 2> >(tee -a "${XML_OUTPUT_FILE}.log" >&2) 1> >(tee -a "${XML_OUTPUT_FILE}.log") 2>&1 || exitCode=$?
+  if [ -z "$COVERAGE_DIR" ]; then
+    "${TEST_PATH}" "$@" 2> >(tee -a "${XML_OUTPUT_FILE}.log" >&2) 1> >(tee -a "${XML_OUTPUT_FILE}.log") 2>&1 || exitCode=$?
+  else
+    "$1" "$TEST_PATH" "${@:3}" 2> >(tee -a "${XML_OUTPUT_FILE}.log" >&2) 1> >(tee -a "${XML_OUTPUT_FILE}.log") 2>&1 || exitCode=$?
+  fi
 fi
 
 for signal in $signals; do