From 2ddf4301102f7a78a03bccf86051a63111b1fcc1 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Mon, 29 Sep 2014 17:33:09 -0400 Subject: Exit code of exited inferiors in -list-thread-groups Don't reset the exit code at inferior exit and print it in -list-thread-groups. gdb/ChangeLog: * NEWS: Announce new exit-code field in -list-thread-groups output. * inferior.c (exit_inferior_1): Don't clear exit code. (inferior_appeared): Clear exit code. * mi/mi-main.c (print_one_inferior): Add printing of the exit code. gdb/testsuite/ChangeLog: * gdb.mi/mi-exit-code.exp: New file. * gdb.mi/mi-exit-code.c: New file. gdb/doc/ChangeLog: * gdb.texinfo (Miscellaneous gdb/mi Commands): Document new exit-code field in -list-thread-groups output. --- gdb/testsuite/gdb.mi/mi-exit-code.c | 27 +++++++++++ gdb/testsuite/gdb.mi/mi-exit-code.exp | 88 +++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+) create mode 100644 gdb/testsuite/gdb.mi/mi-exit-code.c create mode 100644 gdb/testsuite/gdb.mi/mi-exit-code.exp (limited to 'gdb/testsuite/gdb.mi') diff --git a/gdb/testsuite/gdb.mi/mi-exit-code.c b/gdb/testsuite/gdb.mi/mi-exit-code.c new file mode 100644 index 0000000..df711a6 --- /dev/null +++ b/gdb/testsuite/gdb.mi/mi-exit-code.c @@ -0,0 +1,27 @@ +/* Copyright 1999-2014 Free Software Foundation, Inc. + + This file is part of GDB. + + 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/>. */ + +int exit_code = 0; + +int +main (int argc, char **argv) +{ + if (argc > 1) + exit_code = atoi (argv[1]); + + return exit_code; +} diff --git a/gdb/testsuite/gdb.mi/mi-exit-code.exp b/gdb/testsuite/gdb.mi/mi-exit-code.exp new file mode 100644 index 0000000..025879a --- /dev/null +++ b/gdb/testsuite/gdb.mi/mi-exit-code.exp @@ -0,0 +1,88 @@ +# Copyright 1999-2014 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 . + +load_lib mi-support.exp +set MIFLAGS "-i=mi" + +gdb_exit +if [mi_gdb_start] { + continue +} + +standard_testfile + +if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { + untested "failed to compile $testfile" + return -1 +} + +proc test_list_thread_groups { } { + global hex + global decimal + + # Before any run, exit-code should not be present. + mi_gdb_test \ + "122-list-thread-groups" \ + "122\\^done,groups=\\\[\{id=\"i1\",type=\"process\"\}\]" \ + "-list-thread-groups before run shows no exit-code" + + with_test_prefix "first run" { + mi_run_to_main + + # During the run, exit-code should not be present. + mi_gdb_test \ + "123-list-thread-groups" \ + "123\\^done,groups=\\\[\{id=\"i1\",type=\"process\",pid=\"$decimal\",executable=\".*\".*" \ + "-list-thread-groups during run shows no exit-code" + + # Exit the inferior. + mi_send_resuming_command "exec-continue" "continuing to inferior exit" + mi_expect_stop "exited-normally" "" "" "" "" "" "exit normally" + + # After the run, exit-code should be present. + mi_gdb_test \ + "124-list-thread-groups" \ + "124\\^done,groups=\\\[\{id=\"i1\",type=\"process\",exit-code=\"0\",executable=\".*\"\}\]" \ + "-list-thread-groups after exit shows exit-code" + } + + with_test_prefix "second run" { + mi_run_to_main + + # Write the exit code we want in the global var + mi_gdb_test "set var exit_code = 8" ".*\\^done" "write exit code" + + # During the second run, exit-code should not be present. + mi_gdb_test \ + "125-list-thread-groups" \ + "125\\^done,groups=\\\[\{id=\"i1\",type=\"process\",pid=\"$decimal\",executable=\".*\".*" \ + "-list-thread-groups during run shows no exit-code" + + # Exit the inferior. + mi_send_resuming_command "exec-continue" "continuing to inferior exit" + mi_expect_stop "exited" "" "" "" "" "" "exit with code" + + # After the second run, exit-code should be present. + mi_gdb_test \ + "126-list-thread-groups" \ + "126\\^done,groups=\\\[\{id=\"i1\",type=\"process\",exit-code=\"010\",executable=\".*\"\}\]" \ + "-list-thread-groups after exit shows exit-code" + } +} + +test_list_thread_groups + +mi_gdb_exit +return 0 -- cgit v1.1