From 79dc332ba2db30e02e816f6ecbffca548f2f6c30 Mon Sep 17 00:00:00 2001 From: Sandra Loosemore Date: Fri, 18 Sep 2015 11:52:26 -0700 Subject: [PATCH] Fix pathname prefix and timeout issues in gdb.mi/mi-pending.exp. 2015-09-18 Sandra Loosemore gdb/testsuite/ * gdb.mi/mi-pending.exp: Don't use directory prefix when setting the pending breakpoint. Remove timeout override for "Run till MI pending breakpoint on pendfunc3 on thread 2" test. --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.mi/mi-pending.exp | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index e7a7d3a7fb7..7eae863887a 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2015-09-18 Sandra Loosemore + + * gdb.mi/mi-pending.exp: Don't use directory prefix when setting + the pending breakpoint. Remove timeout override for "Run till + MI pending breakpoint on pendfunc3 on thread 2" test. + 2015-09-18 Sandra Loosemore * gdb.mi/mi-cli.exp: Don't require directory prefix in breakpoint diff --git a/gdb/testsuite/gdb.mi/mi-pending.exp b/gdb/testsuite/gdb.mi/mi-pending.exp index 88c68702544..5426db55ebb 100644 --- a/gdb/testsuite/gdb.mi/mi-pending.exp +++ b/gdb/testsuite/gdb.mi/mi-pending.exp @@ -64,8 +64,8 @@ mi_gdb_test "-break-insert -f pendfunc1" \ "MI pending breakpoint on pendfunc1" # Set pending breakpoint with a condition via MI. -mi_gdb_test "-break-insert -f -c x==4 ${libsrc1}:pendfunc2" \ - ".*\\^done,bkpt=\{number=\"2\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"\",pending=\"${libsrc1}:pendfunc2\",cond=\"x==4\",times=\"0\",original-location=\"${libsrc1}:pendfunc2\"\}"\ +mi_gdb_test "-break-insert -f -c x==4 ${libfile1}.c:pendfunc2" \ + ".*\\^done,bkpt=\{number=\"2\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"\",pending=\"${libfile1}.c:pendfunc2\",cond=\"x==4\",times=\"0\",original-location=\"${libfile1}.c:pendfunc2\"\}"\ "MI pending breakpoint on ${libfile1}.c:pendfunc2 if x==4" # Set breakpoint so that we can stop when the thread is created @@ -112,7 +112,7 @@ mi_send_resuming_command "exec-continue" "continuing execution to thread conditi # Check if we stopped in thread 2 like we should. set testname "Run till MI pending breakpoint on pendfunc3 on thread 2" -gdb_expect 5 { +gdb_expect { -re "\\*stopped,reason=\"breakpoint-hit\",disp=\"keep\",bkptno=\"4\",frame=\{addr=\"$hex\",func=\"pendfunc3\".*thread-id=\"2\".*" { pass $testname return 0 -- 2.30.2