[PATCH] Allow multiple tool_opts in dejagnu

[PATCH] Allow multiple tool_opts in dejagnu

[Matthew Sachs]

[-- Attachment #1: Type: text/plain, Size: 296 bytes --]

OK to commit?  Without this, "--tool_opts=-foo -bar" doesn't work.  
Tested by running DejaGNU with "--tool_opts=-O3 -ffast-math".

2005-02-18  Matthew Sachs  <msachs@apple.com>

     *gcc.exp, objc.exp: Put braces around 
additional_flags=$TOOL_OPTIONS; allows for whitespace in $TOOL_OPTIONS.


[-- Attachment #2: dg.txt --]
[-- Type: text/plain, Size: 2053 bytes --]

Index: gcc/testsuite/lib/gcc.exp
===================================================================
RCS file: /cvsroot/gcc/gcc/gcc/testsuite/lib/gcc.exp,v
retrieving revision 1.15
diff -c -3 -p -r1.15 gcc.exp
*** gcc/testsuite/lib/gcc.exp	13 Sep 2004 21:20:12 -0000	1.15
--- gcc/testsuite/lib/gcc.exp	18 Feb 2005 07:42:57 -0000
*************** proc gcc_target_compile { source dest ty
*** 139,145 ****
      # TOOL_OPTIONS must come first, so that it doesn't override testcase
      # specific options.
      if [info exists TOOL_OPTIONS] {
! 	set options [concat "additional_flags=$TOOL_OPTIONS" $options];
      }
      if [target_info exists gcc,timeout] {
  	lappend options "timeout=[target_info gcc,timeout]"
--- 139,145 ----
      # TOOL_OPTIONS must come first, so that it doesn't override testcase
      # specific options.
      if [info exists TOOL_OPTIONS] {
! 	set options [concat "{additional_flags=$TOOL_OPTIONS}" $options];
      }
      if [target_info exists gcc,timeout] {
  	lappend options "timeout=[target_info gcc,timeout]"
Index: gcc/testsuite/lib/objc.exp
===================================================================
RCS file: /cvsroot/gcc/gcc/gcc/testsuite/lib/objc.exp,v
retrieving revision 1.27
diff -c -3 -p -r1.27 objc.exp
*** gcc/testsuite/lib/objc.exp	25 Oct 2004 09:01:13 -0000	1.27
--- gcc/testsuite/lib/objc.exp	18 Feb 2005 07:42:57 -0000
*************** proc objc_target_compile { source dest t
*** 157,163 ****
      # TOOL_OPTIONS must come first, so that it doesn't override testcase
      # specific options.
      if [info exists TOOL_OPTIONS] {
! 	set options [concat "additional_flags=$TOOL_OPTIONS" $options];
      }
  
      # If we have built libobjc along with the compiler (which usually
--- 157,163 ----
      # TOOL_OPTIONS must come first, so that it doesn't override testcase
      # specific options.
      if [info exists TOOL_OPTIONS] {
! 	set options [concat "{additional_flags=$TOOL_OPTIONS}" $options];
      }
  
      # If we have built libobjc along with the compiler (which usually

Re: [PATCH] Allow multiple tool_opts in dejagnu

[Andrew Pinski]

On Feb 18, 2005, at 2:47 AM, Matthew Sachs wrote:

> OK to commit?  Without this, "--tool_opts=-foo -bar" doesn't work.  
> Tested by running DejaGNU with "--tool_opts=-O3 -ffast-math".
>
> 2005-02-18  Matthew Sachs  <msachs@apple.com>
>
>     *gcc.exp, objc.exp: Put braces around 
> additional_flags=$TOOL_OPTIONS; allows for whitespace in 
> $TOOL_OPTIONS.

The ChangeLog should be written like:

	* gcc.exp (gcc_target_compile): Put braces around
	additional_flags=$TOOL_OPTIONS; allows for whitespace in $TOOL_OPTIONS.
	* objc.exp (objc_target_compile): Likewise.

Thanks,
Andrew Pinski

Re: [PATCH] Allow multiple tool_opts in dejagnu

[Matthew Sachs]

On Feb 18, 2005, at 09:54, Andrew Pinski wrote:

>
> On Feb 18, 2005, at 2:47 AM, Matthew Sachs wrote:
>
>> OK to commit?  Without this, "--tool_opts=-foo -bar" doesn't work.  
>> Tested by running DejaGNU with "--tool_opts=-O3 -ffast-math".
>>
>> 2005-02-18  Matthew Sachs  <msachs@apple.com>
>>
>>     *gcc.exp, objc.exp: Put braces around 
>> additional_flags=$TOOL_OPTIONS; allows for whitespace in 
>> $TOOL_OPTIONS.
>
> The ChangeLog should be written like:
>
>     * gcc.exp (gcc_target_compile): Put braces around
>     additional_flags=$TOOL_OPTIONS; allows for whitespace in 
> $TOOL_OPTIONS.
>     * objc.exp (objc_target_compile): Likewise.

OK to commit with revised ChangeLog?  (See 
<http://gcc.gnu.org/ml/gcc-patches/2005-02/msg01045.html> for patch.)