[PATCH] Fix tabs vs. spaces issue in memattr.exp
Michael Snyder
msnyder@vmware.com
Wed Mar 9 18:43:00 GMT 2011
Thanks Mark.
Mark Kettenis wrote:
> On Some terminal emulations expand tabs into spaces. This diff
> adjusts the memattr.exp test to accept spaces as well as tabs, just
> like we do for (most) other tests.
>
> Committed as obvious.
>
>
> 2011-03-09 Mark Kettenis <kettenis@gnu.org>
>
> * gdb.base/memattr.exp: Adjust regexps to accept spaces as well as
> tabs.
>
> Index: gdb.base/memattr.exp
> ===================================================================
> RCS file: /cvs/src/src/gdb/testsuite/gdb.base/memattr.exp,v
> retrieving revision 1.1
> diff -u -p -r1.1 memattr.exp
> --- gdb.base/memattr.exp 23 Feb 2011 18:30:22 -0000 1.1
> +++ gdb.base/memattr.exp 9 Mar 2011 16:49:27 -0000
> @@ -117,23 +117,23 @@ set see4 0
> set see5 0
>
> gdb_test_multiple "info mem" "info mem(1)" {
> - -re "1 y \t$hex $hex wo nocache \[^\r\n\]*" {
> + -re "1 y \[ \t\]+$hex $hex wo nocache \[^\r\n\]*" {
> set see1 1
> exp_continue
> }
> - -re "2 y \t$hex $hex ro nocache \[^\r\n\]*" {
> + -re "2 y \[ \t\]+$hex $hex ro nocache \[^\r\n\]*" {
> set see2 1
> exp_continue
> }
> - -re "3 y \t$hex $hex rw nocache \[^\r\n\]*" {
> + -re "3 y \[ \t\]+$hex $hex rw nocache \[^\r\n\]*" {
> set see3 1
> exp_continue
> }
> - -re "4 y \t$hex $hex rw nocache \[^\r\n\]*" {
> + -re "4 y \[ \t\]+$hex $hex rw nocache \[^\r\n\]*" {
> set see4 1
> exp_continue
> }
> - -re "5 y \t$hex $hex rw nocache .\[^\r\n\]*" {
> + -re "5 y \[ \t\]+$hex $hex rw nocache .\[^\r\n\]*" {
> set see5 1
> exp_continue
> }
> @@ -187,23 +187,23 @@ set see4 0
> set see5 0
>
> gdb_test_multiple "info mem" "mem 2 and 4 were disabled" {
> - -re "1 y \t$hex $hex wo nocache \[^\r\n\]*" {
> + -re "1 y \[ \t\]+$hex $hex wo nocache \[^\r\n\]*" {
> set see1 1
> exp_continue
> }
> - -re "2 n \t$hex $hex ro nocache \[^\r\n\]*" {
> + -re "2 n \[ \t\]+$hex $hex ro nocache \[^\r\n\]*" {
> set see2 1
> exp_continue
> }
> - -re "3 y \t$hex $hex rw nocache \[^\r\n\]*" {
> + -re "3 y \[ \t\]+$hex $hex rw nocache \[^\r\n\]*" {
> set see3 1
> exp_continue
> }
> - -re "4 n \t$hex $hex rw nocache \[^\r\n\]*" {
> + -re "4 n \[ \t\]+$hex $hex rw nocache \[^\r\n\]*" {
> set see4 1
> exp_continue
> }
> - -re "5 y \t$hex $hex rw nocache .\[^\r\n\]*" {
> + -re "5 y \[ \t\]+$hex $hex rw nocache .\[^\r\n\]*" {
> set see5 1
> exp_continue
> }
> @@ -225,23 +225,23 @@ set see4 0
> set see5 0
>
> gdb_test_multiple "info mem" "mem 2-4 were enabled" {
> - -re "1 y \t$hex $hex wo nocache \[^\r\n\]*" {
> + -re "1 y \[ \t\]+$hex $hex wo nocache \[^\r\n\]*" {
> set see1 1
> exp_continue
> }
> - -re "2 y \t$hex $hex ro nocache \[^\r\n\]*" {
> + -re "2 y \[ \t\]+$hex $hex ro nocache \[^\r\n\]*" {
> set see2 1
> exp_continue
> }
> - -re "3 y \t$hex $hex rw nocache \[^\r\n\]*" {
> + -re "3 y \[ \t\]+$hex $hex rw nocache \[^\r\n\]*" {
> set see3 1
> exp_continue
> }
> - -re "4 y \t$hex $hex rw nocache \[^\r\n\]*" {
> + -re "4 y \[ \t\]+$hex $hex rw nocache \[^\r\n\]*" {
> set see4 1
> exp_continue
> }
> - -re "5 y \t$hex $hex rw nocache .\[^\r\n\]*" {
> + -re "5 y \[ \t\]+$hex $hex rw nocache .\[^\r\n\]*" {
> set see5 1
> exp_continue
> }
> @@ -263,23 +263,23 @@ set see4 0
> set see5 0
>
> gdb_test_multiple "info mem" "mem 1 to 5 were disabled" {
> - -re "1 n \t$hex $hex wo nocache \[^\r\n\]*" {
> + -re "1 n \[ \t\]+$hex $hex wo nocache \[^\r\n\]*" {
> set see1 1
> exp_continue
> }
> - -re "2 n \t$hex $hex ro nocache \[^\r\n\]*" {
> + -re "2 n \[ \t\]+$hex $hex ro nocache \[^\r\n\]*" {
> set see2 1
> exp_continue
> }
> - -re "3 n \t$hex $hex rw nocache \[^\r\n\]*" {
> + -re "3 n \[ \t\]+$hex $hex rw nocache \[^\r\n\]*" {
> set see3 1
> exp_continue
> }
> - -re "4 n \t$hex $hex rw nocache \[^\r\n\]*" {
> + -re "4 n \[ \t\]+$hex $hex rw nocache \[^\r\n\]*" {
> set see4 1
> exp_continue
> }
> - -re "5 n \t$hex $hex rw nocache .\[^\r\n\]*" {
> + -re "5 n \[ \t\]+$hex $hex rw nocache .\[^\r\n\]*" {
> set see5 1
> exp_continue
> }
> @@ -301,23 +301,23 @@ set see4 0
> set see5 0
>
> gdb_test_multiple "info mem" "mem 1 to 5 were enabled" {
> - -re "1 y \t$hex $hex wo nocache \[^\r\n\]*" {
> + -re "1 y \[ \t\]+$hex $hex wo nocache \[^\r\n\]*" {
> set see1 1
> exp_continue
> }
> - -re "2 y \t$hex $hex ro nocache \[^\r\n\]*" {
> + -re "2 y \[ \t\]+$hex $hex ro nocache \[^\r\n\]*" {
> set see2 1
> exp_continue
> }
> - -re "3 y \t$hex $hex rw nocache \[^\r\n\]*" {
> + -re "3 y \[ \t\]+$hex $hex rw nocache \[^\r\n\]*" {
> set see3 1
> exp_continue
> }
> - -re "4 y \t$hex $hex rw nocache \[^\r\n\]*" {
> + -re "4 y \[ \t\]+$hex $hex rw nocache \[^\r\n\]*" {
> set see4 1
> exp_continue
> }
> - -re "5 y \t$hex $hex rw nocache .\[^\r\n\]*" {
> + -re "5 y \[ \t\]+$hex $hex rw nocache .\[^\r\n\]*" {
> set see5 1
> exp_continue
> }
> @@ -346,23 +346,23 @@ set see5 0
>
> gdb_test_no_output "delete mem 1" "delete mem 1"
> gdb_test_multiple "info mem" "mem 1 was deleted" {
> - -re "1 y \t$hex $hex wo nocache \[^\r\n\]*" {
> + -re "1 y \[ \t\]+$hex $hex wo nocache \[^\r\n\]*" {
> set see1 1
> exp_continue
> }
> - -re "2 y \t$hex $hex ro nocache \[^\r\n\]*" {
> + -re "2 y \[ \t\]+$hex $hex ro nocache \[^\r\n\]*" {
> set see2 1
> exp_continue
> }
> - -re "3 y \t$hex $hex rw nocache \[^\r\n\]*" {
> + -re "3 y \[ \t\]+$hex $hex rw nocache \[^\r\n\]*" {
> set see3 1
> exp_continue
> }
> - -re "4 y \t$hex $hex rw nocache \[^\r\n\]*" {
> + -re "4 y \[ \t\]+$hex $hex rw nocache \[^\r\n\]*" {
> set see4 1
> exp_continue
> }
> - -re "5 y \t$hex $hex rw nocache .\[^\r\n\]*" {
> + -re "5 y \[ \t\]+$hex $hex rw nocache .\[^\r\n\]*" {
> set see5 1
> exp_continue
> }
> @@ -383,23 +383,23 @@ set see5 0
>
> gdb_test_no_output "delete mem 2 4" "delete mem 2 4"
> gdb_test_multiple "info mem" "mem 2 and 4 were deleted" {
> - -re "1 y \t$hex $hex wo nocache \[^\r\n\]*" {
> + -re "1 y \[ \t\]+$hex $hex wo nocache \[^\r\n\]*" {
> set see1 1
> exp_continue
> }
> - -re "2 y \t$hex $hex ro nocache \[^\r\n\]*" {
> + -re "2 y \[ \t\]+$hex $hex ro nocache \[^\r\n\]*" {
> set see2 1
> exp_continue
> }
> - -re "3 y \t$hex $hex rw nocache \[^\r\n\]*" {
> + -re "3 y \[ \t\]+$hex $hex rw nocache \[^\r\n\]*" {
> set see3 1
> exp_continue
> }
> - -re "4 y \t$hex $hex rw nocache \[^\r\n\]*" {
> + -re "4 y \[ \t\]+$hex $hex rw nocache \[^\r\n\]*" {
> set see4 1
> exp_continue
> }
> - -re "5 y \t$hex $hex rw nocache .\[^\r\n\]*" {
> + -re "5 y \[ \t\]+$hex $hex rw nocache .\[^\r\n\]*" {
> set see5 1
> exp_continue
> }
> @@ -422,23 +422,23 @@ gdb_test "delete mem 2-4" \
> "No memory region number 2.*No memory region number 4." \
> "delete mem 2-4"
> gdb_test_multiple "info mem" "mem 2-4 were deleted" {
> - -re "1 y \t$hex $hex wo nocache \[^\r\n\]*" {
> + -re "1 y \[ \t\]+$hex $hex wo nocache \[^\r\n\]*" {
> set see1 1
> exp_continue
> }
> - -re "2 y \t$hex $hex ro nocache \[^\r\n\]*" {
> + -re "2 y \[ \t\]+$hex $hex ro nocache \[^\r\n\]*" {
> set see2 1
> exp_continue
> }
> - -re "3 y \t$hex $hex rw nocache \[^\r\n\]*" {
> + -re "3 y \[ \t\]+$hex $hex rw nocache \[^\r\n\]*" {
> set see3 1
> exp_continue
> }
> - -re "4 y \t$hex $hex rw nocache \[^\r\n\]*" {
> + -re "4 y \[ \t\]+$hex $hex rw nocache \[^\r\n\]*" {
> set see4 1
> exp_continue
> }
> - -re "5 y \t$hex $hex rw nocache .\[^\r\n\]*" {
> + -re "5 y \[ \t\]+$hex $hex rw nocache .\[^\r\n\]*" {
> set see5 1
> exp_continue
> }
More information about the Gdb-patches
mailing list