From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10721 invoked by alias); 12 Jan 2007 21:40:19 -0000 Received: (qmail 10712 invoked by uid 22791); 12 Jan 2007 21:40:19 -0000 X-Spam-Check-By: sourceware.org Received: from viper.snap.net.nz (HELO viper.snap.net.nz) (202.37.101.8) by sourceware.org (qpsmtpd/0.31) with ESMTP; Fri, 12 Jan 2007 21:40:11 +0000 Received: from kahikatea.snap.net.nz (p202-124-125-80.snap.net.nz [202.124.125.80]) by viper.snap.net.nz (Postfix) with ESMTP id 0B1C53D8131; Sat, 13 Jan 2007 10:40:08 +1300 (NZDT) Received: by kahikatea.snap.net.nz (Postfix, from userid 500) id 5D8084F702; Sat, 13 Jan 2007 10:40:05 +1300 (NZDT) From: Nick Roberts MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <17832.52.568721.127913@kahikatea.snap.net.nz> Date: Fri, 12 Jan 2007 21:40:00 -0000 To: Daniel Jacobowitz Cc: gdb-patches@sources.redhat.com Subject: Re: [PATCH] Fix mi-basics.exp In-Reply-To: <20070112180324.GA30005@nevyn.them.org> References: <17829.29304.465815.173045@kahikatea.snap.net.nz> <20070112180324.GA30005@nevyn.them.org> X-Mailer: VM 7.19 under Emacs 22.0.92.8 X-IsSubscribed: yes 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: 2007-01/txt/msg00321.txt.bz2 > > If approved, I'll make the same change for mi2-basics.exp. > > OK, and thanks a lot for fixing this. objdir is fine; it seems that > dejagnu always arranges to set that to a full path (unless you specify > it yourself in site.exp or on the command line, which we don't). Committed. Below is what I committed for mi2-basics.exp -- Nick http://www.inet.net.nz/~nickrob 2007-01-13 Nick Roberts * gdb.mi/mi-basics.exp, gdb.mi/mi2-basics.exp (test_dir_specification) (test_path_specification): Use objdir instead of srcdir to always get an absolute filename. Index: mi2-basics.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi2-basics.exp,v retrieving revision 1.8 retrieving revision 1.9 diff -c -p -c -p -r1.8 -r1.9 *** mi2-basics.exp 9 Jan 2007 17:59:13 -0000 1.8 --- mi2-basics.exp 12 Jan 2007 21:31:35 -0000 1.9 *************** set testfile "basics" *** 42,48 **** set srcfile ${testfile}.c set binfile ${objdir}/${subdir}/${testfile} set escapedobjdir [string_to_regexp ${objdir}] ! set escapedsrcdir [string_to_regexp ${srcdir}] if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } { untested mi2-basics.exp --- 42,48 ---- set srcfile ${testfile}.c set binfile ${objdir}/${subdir}/${testfile} set escapedobjdir [string_to_regexp ${objdir}] ! set envirodir [string_to_regexp ${objdir}/${subdir}] if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } { untested mi2-basics.exp *************** proc test_breakpoints_deletion {} { *** 150,157 **** proc test_dir_specification {} { global mi_gdb_prompt ! global srcdir global subdir # Add to the search directories, display, then reset back to default # Tests: --- 150,158 ---- proc test_dir_specification {} { global mi_gdb_prompt ! global objdir global subdir + global envirodir # Add to the search directories, display, then reset back to default # Tests: *************** proc test_dir_specification {} { *** 159,167 **** # -environment-directory # -environment-directory -r ! set envirodir [string_to_regexp ${srcdir}/${subdir}] ! ! mi_gdb_test "202-environment-directory ${srcdir}/${subdir}" \ "202\\\^done,source-path=\"${envirodir}.\\\$cdir.\\\$cwd\"" \ "environment-directory arg operation" --- 160,166 ---- # -environment-directory # -environment-directory -r ! mi_gdb_test "202-environment-directory ${objdir}/${subdir}" \ "202\\\^done,source-path=\"${envirodir}.\\\$cdir.\\\$cwd\"" \ "environment-directory arg operation" *************** proc test_path_specification {} { *** 200,208 **** global mi_gdb_prompt global orig_path global objdir ! global srcdir global escapedobjdir ! global escapedsrcdir # Add to the path, display, then reset # Tests: --- 199,207 ---- global mi_gdb_prompt global orig_path global objdir ! global subdir global escapedobjdir ! global envirodir # Add to the path, display, then reset # Tests: *************** proc test_path_specification {} { *** 223,235 **** } set orig_path [string_to_regexp ${orig_path}] mi_gdb_test "207-environment-path" \ "207\\\^done,path=\"$orig_path\"" \ "environment-path no-args operation" ! mi_gdb_test "208-environment-path $srcdir $objdir" \ ! "208\\\^done,path=\"$escapedsrcdir.$escapedobjdir.$orig_path\"" \ "environment-path dir1 dir2 operation" mi_gdb_test "209-environment-path -r $objdir" \ --- 222,235 ---- } set orig_path [string_to_regexp ${orig_path}] + set pathdir [string_to_regexp ${objdir}/${subdir}] mi_gdb_test "207-environment-path" \ "207\\\^done,path=\"$orig_path\"" \ "environment-path no-args operation" ! mi_gdb_test "208-environment-path $objdir ${objdir}/${subdir}" \ ! "208\\\^done,path=\"$escapedobjdir.${envirodir}.$orig_path\"" \ "environment-path dir1 dir2 operation" mi_gdb_test "209-environment-path -r $objdir" \