aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Arnez <arnez@linux.vnet.ibm.com>2014-10-28 15:19:08 +0000
committerAndreas Krebbel <krebbel@linux.vnet.ibm.com>2014-11-13 10:20:39 +0100
commitd1fbcd564ab192434686588b9ff0853e158afbfc (patch)
tree9000227568bc1f56401c2a43d9fda85028409b64
parentb0e59b8f1c5fecb1354de5664f50149ac964d98e (diff)
downloadgdb-d1fbcd564ab192434686588b9ff0853e158afbfc.zip
gdb-d1fbcd564ab192434686588b9ff0853e158afbfc.tar.gz
gdb-d1fbcd564ab192434686588b9ff0853e158afbfc.tar.bz2
Eliminate literal line numbers in mi-console.exp
Remove the literal line number from a regexp in mi-console.exp. Add an appropriate eye-catcher to mi-console.c and refer to that instead. gdb/testsuite/ChangeLog: * gdb.mi/mi-console.c: Add eye-catcher. * gdb.mi/mi-console.exp (semihosted_string): Refer to eye-catcher instead of literal line number.
-rw-r--r--gdb/testsuite/ChangeLog6
-rw-r--r--gdb/testsuite/gdb.mi/mi-console.c2
-rw-r--r--gdb/testsuite/gdb.mi/mi-console.exp3
3 files changed, 9 insertions, 2 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 0ab8225..7daae89 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,11 @@
2014-11-13 Andreas Arnez <arnez@linux.vnet.ibm.com>
+ * gdb.mi/mi-console.c: Add eye-catcher.
+ * gdb.mi/mi-console.exp (semihosted_string): Refer to eye-catcher
+ instead of literal line number.
+
+2014-11-13 Andreas Arnez <arnez@linux.vnet.ibm.com>
+
* gdb.base/shr2.c: Add eye-catcher.
* gdb.base/shlib-call.exp: Refer to eye-catcher instead of literal
line number.
diff --git a/gdb/testsuite/gdb.mi/mi-console.c b/gdb/testsuite/gdb.mi/mi-console.c
index ffed9f0..0cd2243 100644
--- a/gdb/testsuite/gdb.mi/mi-console.c
+++ b/gdb/testsuite/gdb.mi/mi-console.c
@@ -11,4 +11,4 @@ int
main ()
{
hello ();
-}
+} /* after-hello */
diff --git a/gdb/testsuite/gdb.mi/mi-console.exp b/gdb/testsuite/gdb.mi/mi-console.exp
index a98cba3..86645c0 100644
--- a/gdb/testsuite/gdb.mi/mi-console.exp
+++ b/gdb/testsuite/gdb.mi/mi-console.exp
@@ -89,7 +89,8 @@ mi_gdb_test "220-exec-next" \
"Testing console output" \
$output
-mi_expect_stop "end-stepping-range" "main" "" ".*mi-console.c" "14" "" \
+set line [gdb_get_line_number "after-hello"]
+mi_expect_stop "end-stepping-range" "main" "" ".*mi-console.c" $line "" \
"finished step over hello"
mi_gdb_exit