aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Prus <vladimir@codesourcery.com>2008-06-13 19:53:42 +0000
committerVladimir Prus <vladimir@codesourcery.com>2008-06-13 19:53:42 +0000
commit6ae37fefeb44d97562e8ca67413e418893653a9b (patch)
treec09850f8cf9b9f45f6a2266e2d83e1a3d33aca7e
parentce3ac18a8c86858c9118a6115e05d1052f9abc50 (diff)
downloadgdb-6ae37fefeb44d97562e8ca67413e418893653a9b.zip
gdb-6ae37fefeb44d97562e8ca67413e418893653a9b.tar.gz
gdb-6ae37fefeb44d97562e8ca67413e418893653a9b.tar.bz2
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.
-rw-r--r--gdb/testsuite/ChangeLog8
-rw-r--r--gdb/testsuite/gdb.mi/basics.c9
-rw-r--r--gdb/testsuite/gdb.mi/mi-break.exp2
-rw-r--r--gdb/testsuite/gdb.mi/mi-cli.exp2
-rw-r--r--gdb/testsuite/gdb.mi/mi2-cli.exp2
5 files changed, 13 insertions, 10 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 35a3ee4..65a6335 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-13 Vladimir Prus <vladimir@codesourcery.com>
+
+ 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 <vladimir@codesourcery.com>
* 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 e4be7b2..43e1816 100644
--- a/gdb/testsuite/gdb.mi/basics.c
+++ b/gdb/testsuite/gdb.mi/basics.c
@@ -21,6 +21,7 @@
*/
#include <stdio.h>
+#include <unistd.h>
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 b3fc551..2776fda 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 c488449..37c484b 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 d9e3467..0f5a771 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"