[PING][PATCH][gdb/contrib] cc-with-tweaks.sh: Create .dwz file in .tmp subdir

[Tom de Vries <tdevries@suse.de>]

On 22-08-19 16:42, Tom de Vries wrote:
> Hi,
> 
> When running a test-case gdb.base/foo.exp with cc-with-dwz-m, a file
> build/gdb/testsuite/outputs/gdb.base/foo/foo.dwz will be created, alongside
> executable build/gdb/testsuite/outputs/gdb.base/foo/foo.
> 
> This can cause problems in f.i. test-cases that test file name completion.
> 
> Make these problems less likely by moving foo.dwz to a .tmp subdir:
> build/gdb/testsuite/outputs/gdb.base/foo/.tmp/foo.dwz.
> 
> Tested on x86_64-linux.
> 
> OK for trunk?

Ping.

Thanks,
- Tom

> [gdb/contrib] cc-with-tweaks.sh: Create .dwz file in .tmp subdir
> 
> gdb/ChangeLog:
> 
> 2019-08-22  Tom de Vries  <tdevries@suse.de>
> 
> 	* contrib/cc-with-tweaks.sh (get_tmpdir): New function.
> 	Use $tmpdir/$(basename "$output_file").dwz instead of
> 	"${output_file}.dwz".
> 
> ---
>  gdb/contrib/cc-with-tweaks.sh | 16 ++++++++++++----
>  1 file changed, 12 insertions(+), 4 deletions(-)
> 
> diff --git a/gdb/contrib/cc-with-tweaks.sh b/gdb/contrib/cc-with-tweaks.sh
> index 7df16bc6c1..98c4f89afc 100755
> --- a/gdb/contrib/cc-with-tweaks.sh
> +++ b/gdb/contrib/cc-with-tweaks.sh
> @@ -163,6 +163,12 @@ then
>      exit 1
>  fi
>  
> +get_tmpdir ()
> +{
> +    tmpdir=$(dirname "$output_file")/.tmp
> +    mkdir -p "$tmpdir"
> +}
> +
>  if [ "$want_objcopy_compress" = true ]; then
>      $OBJCOPY --compress-debug-sections "$output_file"
>      rc=$?
> @@ -202,17 +208,19 @@ if [ "$want_dwz" = true ]; then
>  	;;
>      esac
>  elif [ "$want_multi" = true ]; then
> +    get_tmpdir
> +    dwz_file=$tmpdir/$(basename "$output_file").dwz
>      # Remove the dwz output file if it exists, so we don't mistake it for a
>      # new file in case dwz fails.
> -    rm -f "${output_file}.dwz"
> +    rm -f "$dwz_file"
>  
>      cp $output_file ${output_file}.alt
> -    $DWZ -m ${output_file}.dwz "$output_file" ${output_file}.alt > /dev/null
> +    $DWZ -m "$dwz_file" "$output_file" ${output_file}.alt > /dev/null
>      rm -f ${output_file}.alt
>  
>      # Validate dwz's work by checking if the expected output file exists.
> -    if [ ! -f "${output_file}.dwz" ]; then
> -	echo "$myname: dwz file ${output_file}.dwz missing."
> +    if [ ! -f "$dwz_file" ]; then
> +	echo "$myname: dwz file $dwz_file missing."
>  	exit 1
>      fi
>  fi
>