From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12456 invoked by alias); 31 Jul 2010 00:03:46 -0000 Received: (qmail 12441 invoked by uid 22791); 31 Jul 2010 00:03:45 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from gateway.codesourcery.com (HELO henry1.codesourcery.com) (38.113.113.105) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sat, 31 Jul 2010 00:03:41 +0000 Received: by henry1.codesourcery.com (Postfix, from userid 1009) id F14B15664F4; Fri, 30 Jul 2010 17:03:39 -0700 (PDT) To: gdb-patches@sourceware.org Subject: [patch] gdb.base/*.exp: Do not expect full paths to file names. Message-Id: <20100731000339.F14B15664F4@henry1.codesourcery.com> Date: Sat, 31 Jul 2010 00:03:00 -0000 From: kazu@codesourcery.com (Kazu Hirata) Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2010-07/txt/msg00600.txt.bz2 Hi, Attached is a patch to adjust break-always.exp and commands.exp to stop expecting full paths to file names. Without this patch, these testcases fail on sparc-solaris2.8. Tested on sparc-solaris2.8. OK to apply? Kazu Hirata 2010-07-30 Kazu Hirata * gdb.base/break-always.exp: Do not expect full paths to file names. * gdb.base/commands.exp: Likewise. Index: gdb/testsuite/gdb.base/break-always.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.base/break-always.exp,v retrieving revision 1.5 diff -u -d -p -r1.5 break-always.exp --- gdb/testsuite/gdb.base/break-always.exp 1 Jun 2010 21:29:21 -0000 1.5 +++ gdb/testsuite/gdb.base/break-always.exp 30 Jul 2010 21:47:45 -0000 @@ -29,7 +29,7 @@ gdb_test "show breakpoint always-inserte runto foo gdb_test "break bar" "Breakpoint 2.*" "set breakpoint on bar" -gdb_continue_to_breakpoint "bar" ".*/break-always.c:$bar_location.*" +gdb_continue_to_breakpoint "bar" ".*break-always.c:$bar_location.*" Index: gdb/testsuite/gdb.base/commands.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.base/commands.exp,v retrieving revision 1.40 diff -u -d -p -r1.40 commands.exp --- gdb/testsuite/gdb.base/commands.exp 10 Jun 2010 19:48:19 -0000 1.40 +++ gdb/testsuite/gdb.base/commands.exp 30 Jul 2010 21:47:45 -0000 @@ -427,7 +427,7 @@ proc bp_deleted_in_command_test {} { # Create a breakpoint, and associate a command-list to it, with # one command that deletes this breakpoint. gdb_test "break factorial" \ - "Breakpoint \[0-9\]+ at .*: file .*/run.c, line \[0-9\]+\." \ + "Breakpoint \[0-9\]+ at .*: file .*run.c, line \[0-9\]+\." \ "breakpoint in bp_deleted_in_command_test" gdb_test_multiple "commands" "begin commands in bp_deleted_in_command_test" { @@ -489,7 +489,7 @@ proc temporary_breakpoint_commands {} { # This test will verify that this commands list is executed when the # breakpoint is hit. gdb_test "tbreak factorial" \ - "Temporary breakpoint \[0-9\]+ at .*: file .*/run.c, line \[0-9\]+\." \ + "Temporary breakpoint \[0-9\]+ at .*: file .*run.c, line \[0-9\]+\." \ "breakpoint in temporary_breakpoint_commands" gdb_test_multiple "commands" \ @@ -634,7 +634,7 @@ proc if_commands_test {} { } } gdb_test_multiple "end" "second end - $test" { - -re "Breakpoint \[0-9\]+ at .*: file .*/run.c, line \[0-9\]+\.\r\n$gdb_prompt $" { + -re "Breakpoint \[0-9\]+ at .*: file .*run.c, line \[0-9\]+\.\r\n$gdb_prompt $" { pass "second end - $test" } -re "Undefined command: \"silent\".*$gdb_prompt $" { @@ -660,7 +660,7 @@ proc if_commands_test {} { } } gdb_test_multiple "end" "second end - $test" { - -re "Breakpoint \[0-9\]+ at .*: file .*/run.c, line \[0-9\]+\.\r\n$gdb_prompt $" { + -re "Breakpoint \[0-9\]+ at .*: file .*run.c, line \[0-9\]+\.\r\n$gdb_prompt $" { pass "second end - $test" } }