do not emit PASS for gdb_test_no_output test if message is empty string.

This patch makes gdb_test_no_output not emit a PASS for a sucessful
test when the message is the empty string. As requested, this makes
it consistent with what gdb_test does.

2010-06-03  Joel Brobecker  <brobecker@adacore.com>

        * lib/gdb.exp (gdb_test_no_output): Do not emit pass for
        successful test if message is the empty string.
This commit is contained in:
Joel Brobecker
2010-06-03 20:29:27 +00:00
parent aaf4119b64
commit c22decce5c
2 changed files with 10 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2010-06-03 Joel Brobecker <brobecker@adacore.com>
* lib/gdb.exp (gdb_test_no_output): Do not emit pass for
successful test if message is the empty string.
2010-06-02 Jan Kratochvil <jan.kratochvil@redhat.com> 2010-06-02 Jan Kratochvil <jan.kratochvil@redhat.com>
* gdb.fortran/module.exp (stopped language detection): New test. * gdb.fortran/module.exp (stopped language detection): New test.

View File

@ -883,7 +883,8 @@ proc gdb_test { args } {
# #
# See gdb_test_multiple for a description of the COMMAND and MESSAGE # See gdb_test_multiple for a description of the COMMAND and MESSAGE
# parameters. If MESSAGE is ommitted, then COMMAND will be used as # parameters. If MESSAGE is ommitted, then COMMAND will be used as
# the message. # the message. (If MESSAGE is the empty string, then sometimes we do not
# call pass or fail at all; I don't understand this at all.)
proc gdb_test_no_output { args } { proc gdb_test_no_output { args } {
global gdb_prompt global gdb_prompt
@ -897,7 +898,9 @@ proc gdb_test_no_output { args } {
set command_regex [string_to_regexp $command] set command_regex [string_to_regexp $command]
gdb_test_multiple $command $message { gdb_test_multiple $command $message {
-re "^$command_regex\r\n$gdb_prompt $" { -re "^$command_regex\r\n$gdb_prompt $" {
pass $message if ![string match "" $message] then {
pass "$message"
}
} }
} }
} }