From b66e66ee3a4237320f7895f5e985089e342779cb Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Wed, 9 Mar 2011 16:54:51 +0000 Subject: [PATCH] * gdb.base/memattr.exp: Adjust regexps to accept spaces as well as tabs. --- gdb/testsuite/ChangeLog | 5 ++ gdb/testsuite/gdb.base/memattr.exp | 80 +++++++++++++++--------------- 2 files changed, 45 insertions(+), 40 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 44926d6bcda..3b133d72b07 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-03-09 Mark Kettenis + + * gdb.base/memattr.exp: Adjust regexps to accept spaces as well as + tabs. + 2011-03-09 Tom Tromey * lib/gdb.exp (inferior_exited_re): Match. leading `['. Wrap in diff --git a/gdb/testsuite/gdb.base/memattr.exp b/gdb/testsuite/gdb.base/memattr.exp index 65bc49c8053..bac5edb8f82 100644 --- a/gdb/testsuite/gdb.base/memattr.exp +++ b/gdb/testsuite/gdb.base/memattr.exp @@ -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 } -- 2.30.2