From: Andreas Arnez <arnez@linux.vnet.ibm.com>
Date: Thu, 23 Oct 2014 13:56:52 +0000 (+0000)
Subject: Eliminate literal line numbers in so-impl-ld.exp
X-Git-Tag: gdb-7.9-branchpoint~580
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9ecfcd1d02e8e92457e7a81d060b8d0d46bb68bd;p=thirdparty%2Fbinutils-gdb.git

Eliminate literal line numbers in so-impl-ld.exp

Remove literal line numbers from the regexps in so-impl-ld.exp.  Add
appropriate eye-catchers to solib1.c and refer to those instead.

gdb/testsuite/ChangeLog:

	* gdb.base/solib1.c: Add eye-catchers.
	* gdb.base/so-impl-ld.exp: Match against eye-catchers instead of
	literal line numbers.
---

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ae7c53c8f0a..d0f1b84a634 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-13  Andreas Arnez  <arnez@linux.vnet.ibm.com>
+
+	* gdb.base/solib1.c: Add eye-catchers.
+	* gdb.base/so-impl-ld.exp: Match against eye-catchers instead of
+	literal line numbers.
+
 2014-11-12  Pedro Alves  <palves@redhat.com>
 
 	* gdb.threads/leader-exit.exp: Test sending ctrl-c works after the
diff --git a/gdb/testsuite/gdb.base/so-impl-ld.exp b/gdb/testsuite/gdb.base/so-impl-ld.exp
index 073c3dfb9b3..3788b6c7113 100644
--- a/gdb/testsuite/gdb.base/so-impl-ld.exp
+++ b/gdb/testsuite/gdb.base/so-impl-ld.exp
@@ -61,12 +61,12 @@ gdb_test "next" "21\[ \t\]*result = solib_main .result.;" \
 
 # Verify that we can step into the second shlib call.
 #
-gdb_test "step" "solib_main .arg=10000. at.*${libfile}.c:17.*" \
+gdb_test "step" "solib_main .arg=10000. at.*${libfile}.c:${decimal}.* HERE .*" \
     "step into solib call"
 
 # Verify that we can step within the shlib call.
 #
-gdb_test "next" "18\[ \t\]*\}" "step in solib call"
+gdb_test "next" "${decimal}\[ \t\]*\}.* STEP .*" "step in solib call"
 
 # Verify that we can step out of the shlib call, and back out into
 # the caller.
diff --git a/gdb/testsuite/gdb.base/solib1.c b/gdb/testsuite/gdb.base/solib1.c
index 2e517504505..224a93d7a40 100644
--- a/gdb/testsuite/gdb.base/solib1.c
+++ b/gdb/testsuite/gdb.base/solib1.c
@@ -14,5 +14,5 @@ int  solib_main (arg)
 #endif
 #endif
 {
-  return arg*arg;
-}
+  return arg*arg;		/* HERE */
+}				/* STEP */