From: Kevin Buettner Date: Wed, 5 Feb 2025 18:27:00 +0000 (-0700) Subject: Capitalize output of successful checkpoint command X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5cf1b0d7353bd40e548b8ac106f92c1beaeaf552;p=thirdparty%2Fbinutils-gdb.git Capitalize output of successful checkpoint command This commit causes the output of a "checkpoint" command to be changed from: checkpoint N: fork returned pid DDDD to: Checkpoint N: fork returned pid DDDD This change was made to bring the output of the "checkpoint" command in line with that of other commands, e.g.: (gdb) break main Breakpoint 1 at ... (gdb) catch exec Catchpoint 2 (exec) (gdb) add-inferior [New inferior 2] Added inferior 2 The tests gdb.base/checkpoint.exp, gdb.base/kill-during-detach.exp, and gdb.multi/checkpoint-multi.exp have been updated to accept the new (capitalized) output from the "checkpoint" command. Reviewed-By: Tom Tromey Approved-By: Andrew Burgess --- diff --git a/gdb/linux-fork.c b/gdb/linux-fork.c index 585474fdfed..e1e2a76f75f 100644 --- a/gdb/linux-fork.c +++ b/gdb/linux-fork.c @@ -959,7 +959,7 @@ checkpoint_command (const char *args, int from_tty) { int parent_pid; - gdb_printf (_("checkpoint %s: fork returned pid %ld.\n"), + gdb_printf (_("Checkpoint %s: fork returned pid %ld.\n"), ((number_of_inferiors () > 1) ? string_printf ("%d.%d", inf->num, fp->num).c_str () : string_printf ("%d", fp->num).c_str ()), diff --git a/gdb/testsuite/gdb.base/checkpoint.exp b/gdb/testsuite/gdb.base/checkpoint.exp index 4a8a9a8eb7f..68bddd8244d 100644 --- a/gdb/testsuite/gdb.base/checkpoint.exp +++ b/gdb/testsuite/gdb.base/checkpoint.exp @@ -359,7 +359,7 @@ with_test_prefix "delete checkpoint 0" { clean_restart $binfile runto_main - gdb_test "checkpoint" "checkpoint 1: fork returned pid $decimal\\." + gdb_test "checkpoint" "Checkpoint 1: fork returned pid $decimal\\." gdb_test "restart 1" "Switching to .*" gdb_test "delete checkpoint 0" "Killed process $decimal" gdb_test "info checkpoints" [string_to_regexp "No checkpoints."] diff --git a/gdb/testsuite/gdb.base/kill-during-detach.exp b/gdb/testsuite/gdb.base/kill-during-detach.exp index 68292cc3c51..d9ab8ee5383 100644 --- a/gdb/testsuite/gdb.base/kill-during-detach.exp +++ b/gdb/testsuite/gdb.base/kill-during-detach.exp @@ -93,7 +93,7 @@ proc run_test { exit_p checkpoint_p } { # Set the checkpoint. gdb_test "checkpoint" \ - "checkpoint 1: fork returned pid $::decimal\\." + "Checkpoint 1: fork returned pid $::decimal\\." } # Must get the PID before we resume the inferior. diff --git a/gdb/testsuite/gdb.multi/checkpoint-multi.exp b/gdb/testsuite/gdb.multi/checkpoint-multi.exp index 2bd654347b0..4860608e704 100644 --- a/gdb/testsuite/gdb.multi/checkpoint-multi.exp +++ b/gdb/testsuite/gdb.multi/checkpoint-multi.exp @@ -24,7 +24,7 @@ require gdb_protocol_is_native set checkpoints_header_re " +Id +Active Target Id +Frame.*?" set proc_re "(?:process $::decimal|Thread $::hex \\(LWP $::decimal\\))" -set ckpt_re "checkpoint" +set ckpt_re "Checkpoint" set main_proc "\\(main process\\)" set hello_c "hello\\.c" set goodbye_c "goodbye\\.c"