aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2013-08-22 13:09:35 -0600
committerTom Tromey <tromey@redhat.com>2013-11-04 10:55:19 -0700
commit95d7853ebb9258f938839ef257242f10851c7c09 (patch)
tree22859ba4fe68babb832f8ee8abe00b143a6ea557
parente4630f71b252fa13df07f93d427e7c9f4505c1fe (diff)
downloadgdb-95d7853ebb9258f938839ef257242f10851c7c09.zip
gdb-95d7853ebb9258f938839ef257242f10851c7c09.tar.gz
gdb-95d7853ebb9258f938839ef257242f10851c7c09.tar.bz2
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 <tromey@redhat.com> * lib/gdb.exp (get_compiler_info): Use log_file -info and restore from that.
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/testsuite/lib/gdb.exp3
2 files changed, 7 insertions, 1 deletions
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 <tromey@redhat.com>
+
+ * lib/gdb.exp (get_compiler_info): Use log_file -info and
+ restore from that.
+
2013-11-02 Maciej W. Rozycki <macro@codesourcery.com>
* 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