From 39fb8e9e0f5c7cb813eaa19a5f7368cb2d425f3f Mon Sep 17 00:00:00 2001 From: Bob Rossi Date: Tue, 27 Sep 2005 22:39:04 +0000 Subject: 2005-09-27 Bob Rossi * gdb.mi/mi-disassemble.exp, gdb.mi/mi2-disassemble.exp: Remove .* from test. Escape the | in mi_gdb_test call. * gdb.mi/mi-basics.exp, gdb.mi/mi-cli.exp, gdb.mi/mi-disassemble.exp, gdb.mi/mi-pthreads.exp, gdb.mi/mi-stack.exp, gdb.mi/mi2-basics.exp, gdb.mi/mi2-cli.exp, gdb.mi/mi2-disassemble.exp, gdb.mi/mi2-pthreads.exp, gdb.mi/mi2-stack.exp: Add extra details to expected regex's in mi_gdb_test calls. * lib/mi-support.exp: Remove arbitrary .* from tests. (mi_gdb_test): Add string_regex variable. Add anchor to main -re. Fully anchor GDB/MI expected results in mi_gdb_test. * lib/gdb.exp (string_to_regexp): Escape the ] character. * gdb.base/sizeof.exp: Remove escape character. Correct test. --- gdb/testsuite/gdb.mi/mi-disassemble.exp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gdb/testsuite/gdb.mi/mi-disassemble.exp') diff --git a/gdb/testsuite/gdb.mi/mi-disassemble.exp b/gdb/testsuite/gdb.mi/mi-disassemble.exp index 0b12497..625c430 100644 --- a/gdb/testsuite/gdb.mi/mi-disassemble.exp +++ b/gdb/testsuite/gdb.mi/mi-disassemble.exp @@ -1,4 +1,4 @@ -# Copyright 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc. +# Copyright 1999, 2000, 2001, 2002, 2004, 2005 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 @@ -163,19 +163,19 @@ proc test_disassembly_bogus_args {} { # -data-disassembly -f basics.c -l 32 -- 9 mi_gdb_test "123-data-disassemble -f foo -l abc -n 0 -- 0" \ - ".*123\\^error,msg=\"mi_cmd_disassemble: Invalid filename.\"" \ + "&.*123\\^error,msg=\"mi_cmd_disassemble: Invalid filename.\"" \ "data-disassemble bogus filename" mi_gdb_test "321-data-disassemble -s foo -e bar -- 0" \ - "321\\^error,msg=\"No symbol \\\\\"foo\\\\\" in current context.\"" \ + "&.*321\\^error,msg=\"No symbol \\\\\"foo\\\\\" in current context.\"" \ "data-disassemble bogus address" mi_gdb_test "456-data-disassemble -s \$pc -f basics.c -- 0" \ - "456\\^error,msg=\"mi_cmd_disassemble: Usage: \\( .-f filename -l linenum .-n howmany.. | .-s startaddr -e endaddr.\\) .--. mixed_mode.\"" \ + "&.*456\\^error,msg=\"mi_cmd_disassemble: Usage: \\( .-f filename -l linenum .-n howmany.. \\| .-s startaddr -e endaddr.\\) .--. mixed_mode.\"" \ "data-disassemble mix different args" mi_gdb_test "789-data-disassemble -f basics.c -l $line_main_body -- 9" \ - "789\\^error,msg=\"mi_cmd_disassemble: Mixed_mode argument must be 0 or 1.\"" \ + "&.*789\\^error,msg=\"mi_cmd_disassemble: Mixed_mode argument must be 0 or 1.\"" \ "data-disassemble wrong mode arg" } -- cgit v1.1