Re: [PATCH v2 11/17] introduce relative_filename and use it

[Pedro Alves <palves@redhat.com>]

On 10/18/2013 09:49 PM, Tom Tromey wrote:
> This introduces a new relative_filename proc to gdb.exp and changes
> some tests to use it.  This helps make these tests parallel-safe.
> 
> 	* gdb.base/fullname.exp: Use standard_output_file,
> 	relative_filename.
> 	* gdb.base/hashline1.exp: Use standard_testfile,
> 	standard_output_file, relative_filename, clean_restart.
> 	* gdb.base/hashline2.exp: Use standard_testfile,
> 	standard_output_file, relative_filename.
> 	* gdb.base/hashline3.exp: Use standard_testfile,
> 	standard_output_file, relative_filename.
> 	* lib/gdb.exp (relative_filename): New proc.

...

It seems like gdb.base/hashline2.exp doesn't actually use
relative_filename.  Was that a mistake?

> diff --git a/gdb/testsuite/gdb.base/hashline2.exp b/gdb/testsuite/gdb.base/hashline2.exp
> index d7ee4a7..cd748ca 100644
> --- a/gdb/testsuite/gdb.base/hashline2.exp
> +++ b/gdb/testsuite/gdb.base/hashline2.exp
> @@ -21,16 +21,15 @@
>  # srcfile is in objdir because we need to machine generate it in order
>  # to get the correct path in the #line directive.
>  
> -set testfile "hashline2"
> -set srcfile "${testfile}.c"
> -set binfile "${objdir}/${subdir}/${testfile}"
> +standard_testfile .c
>  
> -set fd [open ${objdir}/${subdir}/${srcfile} w]
> -puts $fd "#line 2 \"///[pwd]/${subdir}/${srcfile}\""
> +set new_srcfile [standard_output_file $srcfile]
> +set fd [open $new_srcfile w]
> +puts $fd "#line 2 \"///${new_srcfile}\""
>  puts $fd "int main () { return 0; } /* set breakpoint here */"
>  close $fd
>  
> -if { [gdb_compile "${objdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
> +if { [gdb_compile $new_srcfile "${binfile}" executable {debug}] != "" } {
>      untested hashline2.exp
>      return -1
>  }
> @@ -40,7 +39,7 @@ gdb_start
>  gdb_reinitialize_dir $srcdir/$subdir
>  gdb_load ${binfile}
>  
> -set bp_location [gdb_get_line_number "set breakpoint here" ${objdir}/${subdir}/${srcfile}]
> +set bp_location [gdb_get_line_number "set breakpoint here" ${new_srcfile}]
>  
>  # Try to set a breakpoint on the specified file location.
>  

-- 
Pedro Alves