From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 11754 invoked by alias); 25 Oct 2013 21:11:56 -0000 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 Received: (qmail 11741 invoked by uid 89); 25 Oct 2013 21:11:55 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.5 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 25 Oct 2013 21:11:54 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r9PKLJqm008596 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 25 Oct 2013 16:21:19 -0400 Received: from barimba.redhat.com (ovpn-113-54.phx2.redhat.com [10.3.113.54]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r9PKLAJf000870; Fri, 25 Oct 2013 16:21:18 -0400 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v3 16/17] fix some fission tests Date: Fri, 25 Oct 2013 21:11:00 -0000 Message-Id: <1382732464-28121-17-git-send-email-tromey@redhat.com> In-Reply-To: <1382732464-28121-1-git-send-email-tromey@redhat.com> References: <1382732464-28121-1-git-send-email-tromey@redhat.com> X-SW-Source: 2013-10/txt/msg00832.txt.bz2 A couple of Fission tests rely on the current directory layout. This assumption is not valid in parallel mode. This patch fixes the problem by removing the relative directory from the .S files and instead having the tests set debug-file-directory before opening the main file. ~ChangeLog~ 2013-10-24 Tom Tromey * gdb.dwarf2/fission-base.S: Remove "gdb.dwarf/". * gdb.dwarf2/fission-base.exp: Set debug-file-directory before loading binfile. * gdb.dwarf2/fission-loclists.S: Remove "gdb.dwarf/". * gdb.dwarf2/fission-loclists.exp: Set debug-file-directory before loading binfile. --- gdb/testsuite/ChangeLog | 9 +++++++++ gdb/testsuite/gdb.dwarf2/fission-base.S | 4 ++-- gdb/testsuite/gdb.dwarf2/fission-base.exp | 9 ++++++++- gdb/testsuite/gdb.dwarf2/fission-loclists.S | 2 +- gdb/testsuite/gdb.dwarf2/fission-loclists.exp | 9 ++++++++- 5 files changed, 28 insertions(+), 5 deletions(-) diff --git a/gdb/testsuite/gdb.dwarf2/fission-base.S b/gdb/testsuite/gdb.dwarf2/fission-base.S index ccd6b23..e670423 100644 --- a/gdb/testsuite/gdb.dwarf2/fission-base.S +++ b/gdb/testsuite/gdb.dwarf2/fission-base.S @@ -85,7 +85,7 @@ main: .uleb128 0x1 # (DIE (0xb) DW_TAG_compile_unit) .ascii "GNU C 4.6.x-fission\0" # DW_AT_producer .byte 0x1 # DW_AT_language - .ascii "gdb.dwarf2/fission-base.c\0" # DW_AT_name + .ascii "fission-base.c\0" # DW_AT_name .ascii "/tmp/src/gdb/testsuite\0" # DW_AT_comp_dir .byte 1 # DW_AT_GNU_dwo_id .byte 2 @@ -143,7 +143,7 @@ main: .8byte .Letext0-.Ltext0 # DW_AT_high_pc .4byte .Ldebug_line0 # DW_AT_stmt_list .ascii "/tmp/src/gdb/testsuite\0" # DW_AT_comp_dir - .ascii "gdb.dwarf2/fission-base.dwo\0" # DW_AT_GNU_dwo_name + .ascii "fission-base.dwo\0" # DW_AT_GNU_dwo_name .4byte .Ldebug_pubnames0 # DW_AT_GNU_pubnames .4byte .Ldebug_pubtypes0 # DW_AT_GNU_pubtypes .4byte .Ldebug_addr0_begin # DW_AT_GNU_addr_base diff --git a/gdb/testsuite/gdb.dwarf2/fission-base.exp b/gdb/testsuite/gdb.dwarf2/fission-base.exp index bb4eb77..81ca585 100644 --- a/gdb/testsuite/gdb.dwarf2/fission-base.exp +++ b/gdb/testsuite/gdb.dwarf2/fission-base.exp @@ -37,7 +37,14 @@ if [build_executable_from_fission_assembler \ return -1 } -clean_restart ${binfile} +gdb_exit +gdb_start +gdb_reinitialize_dir $srcdir/$subdir +# Make sure we can find the .dwo file, regardless of whether we're +# running in parallel mode. +gdb_test_no_output "set debug-file-directory [file dirname $binfile]" \ + "set debug-file-directory" +gdb_load $binfile if ![runto_main] { return -1 diff --git a/gdb/testsuite/gdb.dwarf2/fission-loclists.S b/gdb/testsuite/gdb.dwarf2/fission-loclists.S index 876c610..ee34a29 100644 --- a/gdb/testsuite/gdb.dwarf2/fission-loclists.S +++ b/gdb/testsuite/gdb.dwarf2/fission-loclists.S @@ -240,7 +240,7 @@ main: .byte 0x5 .4byte .Ldebug_ranges0 # DW_AT_GNU_ranges_base .ascii "/tmp/src/gdb/testsuite\0" # DW_AT_comp_dir - .ascii "gdb.dwarf2/fission-loclists.dwo\0" # DW_AT_GNU_dwo_name + .ascii "fission-loclists.dwo\0" # DW_AT_GNU_dwo_name .4byte .Ldebug_pubnames0 # DW_AT_GNU_pubnames .4byte .Ldebug_pubtypes0 # DW_AT_GNU_pubtypes .4byte .Ldebug_addr0 # DW_AT_GNU_addr_base diff --git a/gdb/testsuite/gdb.dwarf2/fission-loclists.exp b/gdb/testsuite/gdb.dwarf2/fission-loclists.exp index 29ccd1b..dccd6c2 100644 --- a/gdb/testsuite/gdb.dwarf2/fission-loclists.exp +++ b/gdb/testsuite/gdb.dwarf2/fission-loclists.exp @@ -37,7 +37,14 @@ if [build_executable_from_fission_assembler \ return -1 } -clean_restart ${binfile} +gdb_exit +gdb_start +gdb_reinitialize_dir $srcdir/$subdir +# Make sure we can find the .dwo file, regardless of whether we're +# running in parallel mode. +gdb_test_no_output "set debug-file-directory [file dirname $binfile]" \ + "set debug-file-directory" +gdb_load $binfile if ![runto_main] { return -1 -- 1.8.1.4