From 98d837f0efa63cdd430d161e95ca713c4b67399a Mon Sep 17 00:00:00 2001 From: Markus Metzger Date: Thu, 3 Dec 2020 17:04:29 +0100 Subject: [PATCH] gdb, record: rephrase the 'not recording' error message When trying to use one of the record commands without having enabled recording first, GDB gives the error message: (gdb) record function-call-history No record target is currently active. Use one of the "target record-" commands first. In the record help, however, we say: (gdb) help record record, rec Start recording. List of record subcommands: record btrace, record b -- Start branch trace recording. record delete, record del, record d -- Delete the rest of execution log and start recording it anew. record full -- Start full execution recording. record function-call-history -- Prints the execution history at function granularity. record goto -- Restore the program to its state at instruction number N. record instruction-history -- Print disassembled instructions stored in the execution log. record save -- Save the execution log to a file. record stop, record s -- Stop the record/replay target. Change the above error message to (gdb) record function-call-history No recording is currently active. Use the "record full" or "record btrace" command first. to align with the help text. gdb/ChangeLog: 2020-12-03 Markus Metzger * record.c (require_record_target): Rephrase error message. (info_record_command): Likewise. gdb/testsuite/ChangeLog: 2020-12-03 Markus Metzger * gdb.btrace/enable.exp: Update error message. * gdb.btrace/multi-inferior.exp: Likewise. * gdb.btrace/reconnect.exp: Likewise. * gdb.python/py-record-btrace.exp: Likewise. * gdb.python/py-record-full.exp: Likewise. --- gdb/ChangeLog | 5 +++++ gdb/record.c | 6 +++--- gdb/testsuite/ChangeLog | 8 ++++++++ gdb/testsuite/gdb.btrace/enable.exp | 10 +++++----- gdb/testsuite/gdb.btrace/multi-inferior.exp | 4 ++-- gdb/testsuite/gdb.btrace/reconnect.exp | 2 +- gdb/testsuite/gdb.python/py-record-btrace.exp | 2 +- gdb/testsuite/gdb.python/py-record-full.exp | 2 +- 8 files changed, 26 insertions(+), 13 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b379fcf24d5..6e0c8be81bc 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2020-12-21 Markus Metzger + + * record.c (require_record_target): Rephrase error message. + (info_record_command): Likewise. + 2020-12-19 Hannes Domani PR exp/27070 diff --git a/gdb/record.c b/gdb/record.c index f9141192779..204bda0a424 100644 --- a/gdb/record.c +++ b/gdb/record.c @@ -74,8 +74,8 @@ require_record_target (void) t = find_record_target (); if (t == NULL) - error (_("No record target is currently active.\n" - "Use one of the \"target record-\" commands first.")); + error (_("No recording is currently active.\n" + "Use the \"record full\" or \"record btrace\" command first.")); return t; } @@ -325,7 +325,7 @@ info_record_command (const char *args, int from_tty) t = find_record_target (); if (t == NULL) { - printf_filtered (_("No record target is currently active.\n")); + printf_filtered (_("No recording is currently active.\n")); return; } diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index af6638d482d..63f7279ac04 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2020-12-21 Markus Metzger + + * gdb.btrace/enable.exp: Update error message. + * gdb.btrace/multi-inferior.exp: Likewise. + * gdb.btrace/reconnect.exp: Likewise. + * gdb.python/py-record-btrace.exp: Likewise. + * gdb.python/py-record-full.exp: Likewise. + 2020-12-20 Tom de Vries * lib/gdb.exp (save_target_board_info): New proc. diff --git a/gdb/testsuite/gdb.btrace/enable.exp b/gdb/testsuite/gdb.btrace/enable.exp index a968d410384..8ce1dab076f 100644 --- a/gdb/testsuite/gdb.btrace/enable.exp +++ b/gdb/testsuite/gdb.btrace/enable.exp @@ -27,15 +27,15 @@ gdb_exit gdb_start # record cannot be stopped, if it was never active -gdb_test "record stop" "No record target is currently active\\..*" "record stop without target" +gdb_test "record stop" "No recording is currently active\\..*" "record stop without target" # btrace cannot be enabled without a running inferior gdb_test "record btrace" "The program is not being run\\." "record btrace without running program" # no function and no instruction history without btrace enabled -gdb_test "record function-call-history" "No record target is currently active\\..*" "record function-call-history without target" -gdb_test "record instruction-history" "No record target is currently active\\..*" "record instruction-history without target" -gdb_test "info record" "No record target is currently active\\." "info record without target" +gdb_test "record function-call-history" "No recording is currently active\\..*" "record function-call-history without target" +gdb_test "record instruction-history" "No recording is currently active\\..*" "record instruction-history without target" +gdb_test "info record" "No recording is currently active\\." "info record without target" standard_testfile if [prepare_for_testing "failed to prepare" $testfile {} {debug}] { @@ -65,7 +65,7 @@ Recorded 0 instructions in 0 functions \\\(0 gaps\\\) for thread 1.*\\." "info r # stop btrace record gdb_test "record stop" "Process record is stopped and all execution logs are deleted\\." -gdb_test "record stop" "No record target is currently active\\..*" "record stop the second time" +gdb_test "record stop" "No recording is currently active\\..*" "record stop the second time" # enable btrace again gdb_test_no_output "record btrace" "record btrace re-enable" diff --git a/gdb/testsuite/gdb.btrace/multi-inferior.exp b/gdb/testsuite/gdb.btrace/multi-inferior.exp index fdf889f5ed8..23bc852c565 100644 --- a/gdb/testsuite/gdb.btrace/multi-inferior.exp +++ b/gdb/testsuite/gdb.btrace/multi-inferior.exp @@ -55,7 +55,7 @@ with_test_prefix "inferior 2" { with_test_prefix "inferior 1" { gdb_test "inferior 1" "Switching to inferior 1.*" - gdb_test "info record" "No record target is currently active\\." + gdb_test "info record" "No recording is currently active\\." gdb_test_no_output "record btrace" "record btrace" } @@ -69,6 +69,6 @@ with_test_prefix "inferior 3" { return -1 } - gdb_test "info record" "No record target is currently active\\." + gdb_test "info record" "No recording is currently active\\." gdb_test_no_output "record btrace" "record btrace" } diff --git a/gdb/testsuite/gdb.btrace/reconnect.exp b/gdb/testsuite/gdb.btrace/reconnect.exp index 26d04c38a9e..baec86f8aa3 100644 --- a/gdb/testsuite/gdb.btrace/reconnect.exp +++ b/gdb/testsuite/gdb.btrace/reconnect.exp @@ -81,5 +81,5 @@ with_test_prefix "second" { # Test that recording is now off. with_test_prefix "third" { - gdb_test "info record" "No record target is currently active." + gdb_test "info record" "No recording is currently active." } diff --git a/gdb/testsuite/gdb.python/py-record-btrace.exp b/gdb/testsuite/gdb.python/py-record-btrace.exp index bdfb2e3b125..3a84cbe7ac4 100644 --- a/gdb/testsuite/gdb.python/py-record-btrace.exp +++ b/gdb/testsuite/gdb.python/py-record-btrace.exp @@ -47,7 +47,7 @@ with_test_prefix "no or double record" { gdb_test "python gdb.start_recording(\"btrace\")" ".*gdb\.error: The process is already being recorded\..*" gdb_test_no_output "python gdb.stop_recording()" "first" - gdb_test "python gdb.stop_recording()" ".*gdb\.error: No record target is currently active\..*" "second" + gdb_test "python gdb.stop_recording()" ".*gdb\.error: No recording is currently active\..*" "second" } with_test_prefix "preopened record btrace" { diff --git a/gdb/testsuite/gdb.python/py-record-full.exp b/gdb/testsuite/gdb.python/py-record-full.exp index c823bc2c74c..a1f24a3634f 100644 --- a/gdb/testsuite/gdb.python/py-record-full.exp +++ b/gdb/testsuite/gdb.python/py-record-full.exp @@ -47,7 +47,7 @@ with_test_prefix "no or double record" { gdb_test "python gdb.start_recording(\"full\")" ".*gdb\.error: The process is already being recorded\..*" gdb_test_no_output "python gdb.stop_recording()" "first" - gdb_test "python gdb.stop_recording()" ".*gdb\.error: No record target is currently active\..*" "second" + gdb_test "python gdb.stop_recording()" ".*gdb\.error: No recording is currently active\..*" "second" } with_test_prefix "preopened record full" { -- 2.30.2