From 754ebdb8c39e693a1979e1f1089c3376390d9aa7 Mon Sep 17 00:00:00 2001
From: Daisuke Nojiri <dnojiri@chromium.org>
Date: Mon, 24 Oct 2016 09:44:31 -0700
Subject: Output stderr when run_test_scripts.sh fail

This change makes run_test_scripts.sh dump stderr to the terminal
so that the failed test can be debugged. This is necessary to
analyze a failing test on build servers.

BUG=none
BRANCH=none
TEST=sudo FEATURES=test emerge vboot_reference && FEATURES=test
USE=minimal emerge-samus vboot_reference && make runtests

Change-Id: Id9ae0fb174cfe382ec30a1175f54c0891543c46e
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/403428
Reviewed-by: Randall Spangler <rspangler@chromium.org>
---
 tests/futility/run_test_scripts.sh | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/tests/futility/run_test_scripts.sh b/tests/futility/run_test_scripts.sh
index 0080819a..fe19f15b 100755
--- a/tests/futility/run_test_scripts.sh
+++ b/tests/futility/run_test_scripts.sh
@@ -70,23 +70,23 @@ exec 3>&1
 
 echo "-- builtin --"
 for i in $TESTS; do
-  j=${i##*/}
-
-  : $(( progs++ ))
-
-  echo -n "$j ... "
-  rm -rf "${OUTDIR}/$j."*
-  rc=$("$i" "$FUTILITY" 1>"${OUTDIR}/$j.stdout" \
-       2>"${OUTDIR}/$j.stderr" || echo "$?")
-  echo "${rc:-0}" > "${OUTDIR}/$j.return"
-  if [ ! "$rc" ]; then
-    green "passed"
-    : $(( pass++ ))
-    rm -f ${OUTDIR}/$j.{stdout,stderr,return}
-  else
-    red "failed"
-  fi
-
+	j=${i##*/}
+
+	: $(( progs++ ))
+
+	echo -n "$j ... "
+	rm -rf "${OUTDIR}/$j."*
+	rc=$("$i" "$FUTILITY" 1>"${OUTDIR}/$j.stdout" \
+		2>"${OUTDIR}/$j.stderr" || echo "$?")
+	echo "${rc:-0}" > "${OUTDIR}/$j.return"
+	if [ ! "$rc" ]; then
+		green "PASSED"
+		: $(( pass++ ))
+		rm -f ${OUTDIR}/$j.{stdout,stderr,return}
+	else
+		red "FAILED. Stdout is recorded in ${OUTDIR}/$j.stdout"
+		cat ${OUTDIR}/$j.stderr
+	fi
 done
 
 ##############################################################################
-- 
cgit v1.2.1