From 6ae37fefeb44d97562e8ca67413e418893653a9b Mon Sep 17 00:00:00 2001 From: Vladimir Prus Date: Fri, 13 Jun 2008 19:53:42 +0000 Subject: [PATCH] Robustify mi-simplerun. * gdb.mi/basics.c (main): Add a call to sleep. * gdb.mi/mi-cli.exp: Adjust for change in line numbers. * gdb.mi/mi2-cli.exp: Likewise. * gdb.mi/mi-break.exp: Likewise. --- gdb/testsuite/ChangeLog | 8 ++++++++ gdb/testsuite/gdb.mi/basics.c | 9 ++------- gdb/testsuite/gdb.mi/mi-break.exp | 2 +- gdb/testsuite/gdb.mi/mi-cli.exp | 2 +- gdb/testsuite/gdb.mi/mi2-cli.exp | 2 +- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 35a3ee4645a..65a6335202e 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2008-06-13 Vladimir Prus + + Robustify mi-simplerun. + * gdb.mi/basics.c (main): Add a call to sleep. + * gdb.mi/mi-cli.exp: Adjust for change in line numbers. + * gdb.mi/mi2-cli.exp: Likewise. + * gdb.mi/mi-break.exp: Likewise. + 2008-06-11 Vladimir Prus * gdb.mi/mi-break.exp (test_ignore_count): Use mi_expect_stop. diff --git a/gdb/testsuite/gdb.mi/basics.c b/gdb/testsuite/gdb.mi/basics.c index e4be7b2a5e2..43e18165347 100644 --- a/gdb/testsuite/gdb.mi/basics.c +++ b/gdb/testsuite/gdb.mi/basics.c @@ -21,6 +21,7 @@ */ #include +#include int callee4 (void) { @@ -61,6 +62,7 @@ main () callee1 (2, "A string argument.", 3.5); callee1 (2, "A string argument.", 3.5); + sleep (1); printf ("Hello, World!"); callme (1); @@ -68,10 +70,3 @@ main () return 0; } - -/* -Local variables: -change-log-default-name: "ChangeLog-mi" -End: -*/ - diff --git a/gdb/testsuite/gdb.mi/mi-break.exp b/gdb/testsuite/gdb.mi/mi-break.exp index b3fc551c7e0..2776fda4ae6 100644 --- a/gdb/testsuite/gdb.mi/mi-break.exp +++ b/gdb/testsuite/gdb.mi/mi-break.exp @@ -158,7 +158,7 @@ proc test_ignore_count {} { mi_run_cmd - mi_expect_stop "breakpoint-hit" "callme" "\{name=\"i\",value=\"2\"\}" ".*basics.c" "51" \ + mi_expect_stop "breakpoint-hit" "callme" "\{name=\"i\",value=\"2\"\}" ".*basics.c" "52" \ {"" "disp=\"keep\"" } "run to breakpoint with ignore count" } diff --git a/gdb/testsuite/gdb.mi/mi-cli.exp b/gdb/testsuite/gdb.mi/mi-cli.exp index c488449fb59..37c484bb985 100644 --- a/gdb/testsuite/gdb.mi/mi-cli.exp +++ b/gdb/testsuite/gdb.mi/mi-cli.exp @@ -96,7 +96,7 @@ mi_gdb_test "-interpreter-exec console \"list\"" \ ".*\~\"$line_main_body\[\\\\t \]*callee1.*;\\\\n\".*\\^done" \ "-interpreter-exec console \"list\"" -mi_execute_to "exec-continue" "breakpoint-hit" "callee4" "" ".*basics.c" "27" \ +mi_execute_to "exec-continue" "breakpoint-hit" "callee4" "" ".*basics.c" "28" \ { "" "disp=\"keep\"" } "continue to callee4" # NOTE: cagney/2003-02-03: Not yet. diff --git a/gdb/testsuite/gdb.mi/mi2-cli.exp b/gdb/testsuite/gdb.mi/mi2-cli.exp index d9e34679d4c..0f5a7714f34 100644 --- a/gdb/testsuite/gdb.mi/mi2-cli.exp +++ b/gdb/testsuite/gdb.mi/mi2-cli.exp @@ -96,7 +96,7 @@ mi_gdb_test "-interpreter-exec console \"list\"" \ ".*\~\"$line_main_body\[\\\\t \]*callee1.*;\\\\n\".*\\^done" \ "-interpreter-exec console \"list\"" -mi_execute_to "exec-continue" "breakpoint-hit" "callee4" "" ".*basics.c" "27" \ +mi_execute_to "exec-continue" "breakpoint-hit" "callee4" "" ".*basics.c" "28" \ { "" "disp=\"keep\"" } \ "continue to callee4" -- 2.30.2