[PATCH 04/16] Eliminate literal line numbers in call-rt-st.exp

Andreas Arnez
2014-10-29T16:01:43Z

Remove literal line numbers from the regexps in call-rt-st.exp. Add
appropriate eye-catchers to call-rt-st.c and refer to those instead.

gdb/testsuite/ChangeLog:

* gdb.base/call-rt-st.c: Add eye-catchers.
* gdb.base/call-rt-st.exp: Refer to eye-catchers instead of
literal line numbers.
---
gdb/testsuite/gdb.base/call-rt-st.c | 6 +++---
gdb/testsuite/gdb.base/call-rt-st.exp | 11 ++++++-----
2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/gdb/testsuite/gdb.base/call-rt-st.c b/gdb/testsuite/gdb.base/call-rt-st.c
index 09dd5bb..a583bab 100644
--- a/gdb/testsuite/gdb.base/call-rt-st.c
+++ b/gdb/testsuite/gdb.base/call-rt-st.c
@@ -125,7 +125,7 @@ void loop_count () {

int index;

- for (index=0; index<4; index++);
+ for (index=0; index<4; index++); /* -break1- */
}

/*****************************************************************
@@ -772,9 +772,9 @@ int main () {
print_int_char_combo(*int_char_combo);
print_struct_rep(*struct1);

- loop_count();
+ loop_count(); /* -finish2- */

- return 0;
+ return 0; /* -finish1- */
}

diff --git a/gdb/testsuite/gdb.base/call-rt-st.exp b/gdb/testsuite/gdb.base/call-rt-st.exp
index 0ca312c..925d896 100644
--- a/gdb/testsuite/gdb.base/call-rt-st.exp
+++ b/gdb/testsuite/gdb.base/call-rt-st.exp
@@ -64,19 +64,20 @@ if ![runto_main] then {
}

+set stop_line [gdb_get_line_number "-break1-"]
gdb_test "break loop_count" \
- "Breakpoint.* file .*call-rt-st.c, line 128\\." \
+ "Breakpoint.* file .*call-rt-st.c, line $stop_line\\." \
"breakpoint loop_count"

gdb_test "continue" \
- "Continuing\\..*Breakpoint.*loop_count \\(\\) at.*call-rt-st.c:128\[ \t\r\n\]+128\[\t \]+for \\(index=0; index.4; index..\\);\[\r\n \]+" \
+ "Continuing\\..*Breakpoint.*loop_count \\(\\) at.*call-rt-st.c:$stop_line\[ \t\r\n\]+$stop_line\[\t \]+for \\(index=0; index.4; index..\\);.*\[\r\n \]+" \
"continue to loop_count"

gdb_test_multiple "finish" "finish out from loop count" {
- -re "Run till exit from .0 loop_count \\(\\) at.*call-rt-st.c:128\[ \t\r\n\]+main \\(\\) at.*call-rt-st.c:777\[ \t\r\n\]+777\[\t \]+return 0;.*$gdb_prompt $" {
- pass "finish out from loop_count (line 777)"
+ -re "Run till exit from .0 loop_count \\(\\) at.*call-rt-st.c:$stop_line\[ \t\r\n\]+main \\(\\) at.*call-rt-st.c:\[0-9\]+\[ \t\r\n\]+\[0-9\]+\[\t \]+return 0;.*-finish1-.*$gdb_prompt $" {
+ pass "finish out from loop_count (finish1)"
}
- -re "Run till exit from .0 loop_count \\(\\) at.*call-rt-st.c:128\[ \t\r\n\]+main \\(\\) at.*call-rt-st.c:775\[ \t\r\n\]+775\[\t \]+loop_count.*$gdb_prompt $" {
+ -re "Run till exit from .0 loop_count \\(\\) at.*call-rt-st.c:$stop_line\[ \t\r\n\]+main \\(\\) at.*call-rt-st.c:\[0-9\]+\[ \t\r\n\]+\[0-9\]+\[\t \]+loop_count.*-finish2-.*$gdb_prompt $" {
pass "finish out from loop_count (line 775)"
}
}
--
1.8.4.2