Preserve nested runtest log messages when test fails in stats.exp

3 files changed, 14 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 26df2e3..24f9ce9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2021-05-20  Jacob Bachmeyer  <jcb@gnu.org>
 
+	* testsuite/lib/runtest.exp (runtest_copy_nested_testsuite_log):
+	New procedure.  Dumps log from nested run into main test log.
+
+	* testsuite/runtest.main/stats.exp: Copy stat.log from nested
+	testsuite run to the main test log upon test failure.
+
 	* testsuite/runtest.main/nested/testsuite/stat.test/unit-sub.exp:
 	Explicitly pass /dev/null to unit-sub.awk because /usr/bin/awk on
 	Solaris 10 does not seem to recognize assignment to ARGV.
diff --git a/testsuite/lib/runtest.exp b/testsuite/lib/runtest.exp
index 4efd0df..299cb0a 100644
--- a/testsuite/lib/runtest.exp
+++ b/testsuite/lib/runtest.exp
@@ -70,6 +70,13 @@ proc runtest_setup_nested_testsuite {} {
     }
 }
 
+proc runtest_copy_nested_testsuite_log { tool } {
+    verbose -log -- "---- ${tool}.log from failed test ----"
+    spawn -open [open [testsuite file -object -top tmpdir "${tool}.log"]]
+    expect { .+ { exp_continue } }
+    verbose -log -- "---- end ${tool}.log ----"
+}
+
 proc runtest_cleanup_nested_testsuite {} {
     upvar 1 tmpdir tmpdir
 
diff --git a/testsuite/runtest.main/stats.exp b/testsuite/runtest.main/stats.exp
index 7f4f5be..a380751 100644
--- a/testsuite/runtest.main/stats.exp
+++ b/testsuite/runtest.main/stats.exp
@@ -50,6 +50,7 @@ foreach t $tests {
 	    "" \
 	    [lindex $t 2]] } {
 	fail "[lindex $t 0]/[lindex $t 1]"
+	runtest_copy_nested_testsuite_log stat
     } else {
 	pass "[lindex $t 0]/[lindex $t 1]"
     }