From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-23819-listarch-gdb-patches=sources.redhat.com@sources.redhat.com>
Received: (qmail 22238 invoked by alias); 10 Apr 2003 23:05:23 -0000
Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:gdb-patches-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sources.redhat.com>
List-Help: <mailto:gdb-patches-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: gdb-patches-owner@sources.redhat.com
Received: (qmail 22224 invoked from network); 10 Apr 2003 23:05:23 -0000
Received: from unknown (HELO zenia.red-bean.com) (12.222.151.100)
  by sources.redhat.com with SMTP; 10 Apr 2003 23:05:23 -0000
Received: from zenia.red-bean.com (localhost.localdomain [127.0.0.1])
	by zenia.red-bean.com (8.12.5/8.12.5) with ESMTP id h3AN6XFq029441;
	Thu, 10 Apr 2003 18:06:33 -0500
Received: (from jimb@localhost)
	by zenia.red-bean.com (8.12.5/8.12.5/Submit) id h3AN6Wxj029437;
	Thu, 10 Apr 2003 18:06:32 -0500
To: gdb-patches@sources.redhat.com
Subject: RFA: match source code, not line numbers
From: Jim Blandy <jimb@redhat.com>
Date: Thu, 10 Apr 2003 23:05:00 -0000
Message-ID: <vt28yuiosuf.fsf@zenia.red-bean.com>
User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.2.95
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-SW-Source: 2003-04/txt/msg00220.txt.bz2


This makes these tests more robust when the .cc files are edited.

2003-04-10  Jim Blandy  <jimb@qa1a.devel.redhat.com>

	* gdb.c++/derivation.exp, gdb.c++/overload.exp,
	gdb.c++/userdef.exp: Match against the program text, not line
	numbers, to check that we've returned to the right place.

Index: gdb/testsuite/gdb.c++/derivation.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.c++/derivation.exp,v
retrieving revision 1.11
diff -c -r1.11 derivation.exp
*** gdb/testsuite/gdb.c++/derivation.exp	9 Apr 2003 23:21:14 -0000	1.11
--- gdb/testsuite/gdb.c++/derivation.exp	10 Apr 2003 23:01:08 -0000
***************
*** 310,316 ****
      -re "#0  marker1.*$gdb_prompt $" {
          setup_kfail "gdb/1155" s390-*-linux-gnu
          fail "re-selected 'main' frame after inferior call"
!         gdb_test "finish" ".*main.*at .*derivation.cc:21\[79\].*" \
              "finish call to marker1"
      }
      -re "#1  ($hex in )?main.*$gdb_prompt $" {
--- 310,316 ----
      -re "#0  marker1.*$gdb_prompt $" {
          setup_kfail "gdb/1155" s390-*-linux-gnu
          fail "re-selected 'main' frame after inferior call"
!         gdb_test "finish" ".*main.*at .*derivation.cc:.*(marker1\\(\\);|a_instance\\.a = 20;).*" \
              "finish call to marker1"
      }
      -re "#1  ($hex in )?main.*$gdb_prompt $" {
Index: gdb/testsuite/gdb.c++/overload.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.c++/overload.exp,v
retrieving revision 1.11
diff -c -r1.11 overload.exp
*** gdb/testsuite/gdb.c++/overload.exp	9 Apr 2003 23:21:14 -0000	1.11
--- gdb/testsuite/gdb.c++/overload.exp	10 Apr 2003 23:01:08 -0000
***************
*** 129,135 ****
      -re "#0  marker1.*$gdb_prompt $" {
          setup_kfail "gdb/1155" s390-*-linux-gnu
          fail "re-selected 'main' frame after inferior call"
!         gdb_test "finish" ".*main.*at .*overload.cc:7\[78\].*" \
              "finish call to marker1"
      }
      -re "#1  ($hex in )?main.*$gdb_prompt $" {
--- 129,135 ----
      -re "#0  marker1.*$gdb_prompt $" {
          setup_kfail "gdb/1155" s390-*-linux-gnu
          fail "re-selected 'main' frame after inferior call"
!         gdb_test "finish" ".*main.*at .*overload.cc:.*(marker1\\(\\);|return 0;).*" \
              "finish call to marker1"
      }
      -re "#1  ($hex in )?main.*$gdb_prompt $" {
Index: gdb/testsuite/gdb.c++/userdef.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.c++/userdef.exp,v
retrieving revision 1.7
diff -c -r1.7 userdef.exp
*** gdb/testsuite/gdb.c++/userdef.exp	9 Apr 2003 23:21:14 -0000	1.7
--- gdb/testsuite/gdb.c++/userdef.exp	10 Apr 2003 23:01:08 -0000
***************
*** 75,81 ****
      -re "#0  marker1.*$gdb_prompt $" {
          setup_kfail "gdb/1155" s390-*-linux-gnu
          fail "re-selected 'main' frame after inferior call"
!         gdb_test "finish" ".*main.*at .*userdef.cc:27\[67\].*" \
                  "finish call to marker1"
      }
      -re "#1  ($hex in )?main.*$gdb_prompt $" {
--- 75,81 ----
      -re "#0  marker1.*$gdb_prompt $" {
          setup_kfail "gdb/1155" s390-*-linux-gnu
          fail "re-selected 'main' frame after inferior call"
!         gdb_test "finish" ".*main.*at .*userdef.cc:.*(marker1\\(\\);|cout << one;).*" \
                  "finish call to marker1"
      }
      -re "#1  ($hex in )?main.*$gdb_prompt $" {