public inbox for gdb-cvs@sourceware.org help / color / mirror / Atom feed
From: Tom de Vries <vries@sourceware.org> To: gdb-cvs@sourceware.org Subject: [binutils-gdb] [gdb/testsuite] Fix error message for cmd with trailing newline Date: Mon, 10 Oct 2022 12:44:43 +0000 (GMT) [thread overview] Message-ID: <20221010124443.D12213858D37@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=ed6cd15957b80502410b771e080a88b2e4c949dd commit ed6cd15957b80502410b771e080a88b2e4c949dd Author: Tom de Vries <tdevries@suse.de> Date: Mon Oct 10 14:44:40 2022 +0200 [gdb/testsuite] Fix error message for cmd with trailing newline I noticed that the error message in gdb_test_multiple about trailing newline in a command does not mention the offending command, nor the word command: ... if [string match "*\[\r\n\]" $command] { error "Invalid trailing newline in \"$message\" test" } ... Fix this by using instead: ... error "Invalid trailing newline in \"$command\" command" ... Also add a test-case to trigger this: gdb.testsuite/gdb-test.exp. Tested on x86_64-linux. Diff: --- gdb/testsuite/gdb.testsuite/gdb-test.exp | 28 ++++++++++++++++++++++++++++ gdb/testsuite/lib/gdb.exp | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/gdb.testsuite/gdb-test.exp b/gdb/testsuite/gdb.testsuite/gdb-test.exp new file mode 100644 index 00000000000..2ce8eb31d73 --- /dev/null +++ b/gdb/testsuite/gdb.testsuite/gdb-test.exp @@ -0,0 +1,28 @@ +# Copyright 2022 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/>. + +# The purpose of this test-case is to check various +# gdb_test / gdb_test_multiple properties. + +clean_restart + +# Check that a command with trailing newline triggers an error. + +set results [catch { + gdb_test "pwd\n" ".*" "cmd with trailing newline" +} output] + +gdb_assert { $results == 1 } +set expected_error_msg "Invalid trailing newline in \"pwd\n\" command" +gdb_assert { [string equal $output $expected_error_msg] } diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index ae3a46cd4ce..5f0acfaa530 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -1000,7 +1000,7 @@ proc gdb_test_multiple { command message args } { } if [string match "*\[\r\n\]" $command] { - error "Invalid trailing newline in \"$message\" test" + error "Invalid trailing newline in \"$command\" command" } if [string match "*\[\r\n\]*" $message] {
reply other threads:[~2022-10-10 12:44 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20221010124443.D12213858D37@sourceware.org \ --to=vries@sourceware.org \ --cc=gdb-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).