From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2205) id D12213858D37; Mon, 10 Oct 2022 12:44:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D12213858D37 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1665405883; bh=fMTpZDT3OmTwZyzXA07U3jLHtcHD9OOSu4BOvGpOS00=; h=From:To:Subject:Date:From; b=G/laB4+N428L0rvb1RFxF28yd3cbm8abJXt7pIX4udSo5HLLhezLgoCvvYSJqYFgX vHyB8W8NILG58h6LvuLfsJYJKtUpyTNbVKCe8YmARtOvOYq+J6la2Vi/3AkcGoC/cZ FdJx/I6qXrb0WDMsNXsFu8OPIKdcH0vPh5FKboa4= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom de Vries To: gdb-cvs@sourceware.org Subject: [binutils-gdb] [gdb/testsuite] Fix error message for cmd with trailing newline X-Act-Checkin: binutils-gdb X-Git-Author: Tom de Vries X-Git-Refname: refs/heads/master X-Git-Oldrev: 66984afd29ea9bad2155ed21098437a71208a106 X-Git-Newrev: ed6cd15957b80502410b771e080a88b2e4c949dd Message-Id: <20221010124443.D12213858D37@sourceware.org> Date: Mon, 10 Oct 2022 12:44:43 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Ded6cd15957b8= 0502410b771e080a88b2e4c949dd commit ed6cd15957b80502410b771e080a88b2e4c949dd Author: Tom de Vries Date: Mon Oct 10 14:44:40 2022 +0200 [gdb/testsuite] Fix error message for cmd with trailing newline =20 I noticed that the error message in gdb_test_multiple about trailing ne= wline in a command does not mention the offending command, nor the word comma= nd: ... if [string match "*\[\r\n\]" $command] { error "Invalid trailing newline in \"$message\" test" } ... =20 Fix this by using instead: ... error "Invalid trailing newline in \"$command\" command" ... =20 Also add a test-case to trigger this: gdb.testsuite/gdb-test.exp. =20 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.t= estsuite/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 . + +# 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 =3D=3D 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 } { } =20 if [string match "*\[\r\n\]" $command] { - error "Invalid trailing newline in \"$message\" test" + error "Invalid trailing newline in \"$command\" command" } =20 if [string match "*\[\r\n\]*" $message] {