diff options
author | Joel Brobecker <brobecker@gnat.com> | 2013-10-11 08:23:11 +0000 |
---|---|---|
committer | Joel Brobecker <brobecker@gnat.com> | 2013-10-11 08:23:11 +0000 |
commit | 7c647d615590f8d1c4cca70f547534a9792f45c3 (patch) | |
tree | d6f5e31bcced8897c29305006c553eb9af2e0de1 /gdb/testsuite | |
parent | 0cf4063e29439cdf8693d2357ead6659c6defd74 (diff) | |
download | gdb-7c647d615590f8d1c4cca70f547534a9792f45c3.zip gdb-7c647d615590f8d1c4cca70f547534a9792f45c3.tar.gz gdb-7c647d615590f8d1c4cca70f547534a9792f45c3.tar.bz2 |
warn if "source" fails to open the file when from_tty == 0
Consider the following example:
% gdb -q -batch -ex 'source nonexistant-file'
[nothing]
One would have at least expected the debugger to warn about
not finding the file, similar to the error shown when using
a more interactive mode. Eg:
(gdb) source nonexistant-file
nonexistant-file: No such file or directory.
Not raising an error appears to be intentional, presumably in order
to prevent this situation from stoping the execution of a GDB script.
But the lack of at least a warning makes it harder for a user to
diagnose any issue, if the file was expected to be there and readable.
This patch adds a warning in that case:
% gdb -q -batch -ex 'source nonexistant-file'
warning: nonexistant-file: No such file or directory.
gdb/ChangeLog:
* utils.h (perror_warning_with_name): Add declaration.
* utils.c (perror_warning_with_name): New function.
* cli/cli-cmds.c (source_script_with_search): Add call to
perror_warning_with_name if from_tty is nul.
gdb/testsuite/ChangeLog:
* gdb.base/source-nofile.gdb: New file.
* gdb.base/source.exp: Add two tests verifying the behavior when
the "source" command is given a non-existant filename.
Diffstat (limited to 'gdb/testsuite')
-rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/source-nofile.gdb | 22 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/source.exp | 9 |
3 files changed, 37 insertions, 0 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index c2a1593..9f45e83 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2013-10-11 Joel Brobecker <brobecker@adacore.com> + + * gdb.base/source-nofile.gdb: New file. + * gdb.base/source.exp: Add two tests verifying the behavior when + the "source" command is given a non-existant filename. + 2013-10-11 Yao Qi <yao@codesourcery.com> * gdb.mi/mi-catch-load.c: Remove the include of "dlfcn.h". diff --git a/gdb/testsuite/gdb.base/source-nofile.gdb b/gdb/testsuite/gdb.base/source-nofile.gdb new file mode 100644 index 0000000..e577a41 --- /dev/null +++ b/gdb/testsuite/gdb.base/source-nofile.gdb @@ -0,0 +1,22 @@ +# This testcase is part of GDB, the GNU debugger. +# +# Copyright 2013 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/>. + +source for-sure-nonexistant-file + +# Just print an message to confirm that failing to source the file +# did not cause this script to abort. +echo source error not fatal\n diff --git a/gdb/testsuite/gdb.base/source.exp b/gdb/testsuite/gdb.base/source.exp index 61fd221..62a6599 100644 --- a/gdb/testsuite/gdb.base/source.exp +++ b/gdb/testsuite/gdb.base/source.exp @@ -57,4 +57,13 @@ gdb_test "source -v -s ./source-test.gdb" \ "echo test source options.*" \ "source -v -s" +# Test sourcing a non-existant file, both when the source command +# comes from the a command entered at the GDB prompt, and when +# it comes from a script being sourced. +gdb_test "source for-sure-nonexistant-file" \ + "for-sure-nonexistant-file: No such file or directory\." + +gdb_test "source source-nofile.gdb" \ + "warning: for-sure-nonexistant-file: No such file or directory\.\[\r\n\]*source error not fatal" + gdb_exit |