From 95d7853ebb9258f938839ef257242f10851c7c09 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 22 Aug 2013 13:09:35 -0600 Subject: [PATCH] fix up log-file toggling Currently a proc in gdb.exp toggles the expect (and thus dejagnu) logging. This is not a super idea, but it is there to avoid putting some preprocessor output into the log. In the right circumstances, this can result in the log file being mysteriously truncated. I think this happens because it doesn't necessarily write to the correct log file again. The fix is to use "log_file -info" to save the previous log file. 2013-11-04 Tom Tromey * lib/gdb.exp (get_compiler_info): Use log_file -info and restore from that. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/lib/gdb.exp | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 249eb88..35844c0 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-11-04 Tom Tromey + + * lib/gdb.exp (get_compiler_info): Use log_file -info and + restore from that. + 2013-11-02 Maciej W. Rozycki * gdb.cp/derivation.exp: s/perrro/perror/ diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 3df1c8f..21a44af 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -2445,6 +2445,7 @@ proc get_compiler_info {{arg ""}} { # Run $ifile through the right preprocessor. # Toggle gdb.log to keep the compiler output out of the log. + set saved_log [log_file -info] log_file if [is_remote host] { # We have to use -E and -o together, despite the comments @@ -2457,7 +2458,7 @@ proc get_compiler_info {{arg ""}} { } else { set cppout [ gdb_compile "${ifile}" "" preprocess [list "$arg" quiet] ] } - log_file -a "$outdir/$tool.log" + eval log_file $saved_log # Eval the output. set unknown 0 -- 2.7.4