aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2022-12-27 16:34:44 -0700
committerTom Tromey <tom@tromey.com>2022-12-28 09:38:34 -0700
commitecb7214fc18f63693dac6065e36802e0677412e7 (patch)
tree5eaf026fceffafa67106b0e61161606f568f9454
parentbb9bdfb840f43036fbab27ace2fedefa698abe9b (diff)
downloadgdb-ecb7214fc18f63693dac6065e36802e0677412e7.zip
gdb-ecb7214fc18f63693dac6065e36802e0677412e7.tar.gz
gdb-ecb7214fc18f63693dac6065e36802e0677412e7.tar.bz2
Fix "set debug timestamp"
PR cli/29945 points out that "set debug timestamp 1" stopped working -- this is a regression due to commit b8043d27 ("Remove a ui-related memory leak"). This patch fixes the bug and adds a regression test. I think this should probably be backported to the gdb 13 branch. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=29945 (cherry picked from commit a60535c39ba52d88c47740db6ab116db32e2331a)
-rw-r--r--gdb/testsuite/gdb.base/timestamp.exp24
-rw-r--r--gdb/top.c2
2 files changed, 25 insertions, 1 deletions
diff --git a/gdb/testsuite/gdb.base/timestamp.exp b/gdb/testsuite/gdb.base/timestamp.exp
new file mode 100644
index 0000000..3d124b4
--- /dev/null
+++ b/gdb/testsuite/gdb.base/timestamp.exp
@@ -0,0 +1,24 @@
+# Copyright 2022 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Test that timestamps are printed when logging.
+
+clean_restart
+
+# This is a simple way to get logging output.
+gdb_test_no_output "set debug expression 1"
+gdb_test_no_output "set debug timestamp 1"
+
+gdb_test "print 23" "\[0-9\]+\\.\[0-9\]+ Operation: OP_LONG.* = 23"
diff --git a/gdb/top.c b/gdb/top.c
index b732f29..1422c88 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -305,7 +305,7 @@ ui::ui (FILE *instream_, FILE *outstream_, FILE *errstream_)
m_gdb_stdout (new pager_file (new stdio_file (outstream))),
m_gdb_stdin (new stdio_file (instream)),
m_gdb_stderr (new stderr_file (errstream)),
- m_gdb_stdlog (m_gdb_stderr)
+ m_gdb_stdlog (new timestamped_file (m_gdb_stderr))
{
unbuffer_stream (instream_);