diff mbox

[FFmpeg-devel] configure: do not add --fsanitize= if coverage is tested

Message ID 20180819204018.14286-1-michael@niedermayer.cc
State Accepted
Commit 4251a44e7d9ec0322973ae2b286942f03632eeeb
Headers show

Commit Message

Michael Niedermayer Aug. 19, 2018, 8:40 p.m. UTC
Found-by: Max Moroz
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

James Almer Aug. 20, 2018, 1:55 p.m. UTC | #1
On 8/19/2018 5:40 PM, Michael Niedermayer wrote:
> Found-by: Max Moroz
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  configure | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/configure b/configure
> index 9b5421d5a8..b9c9d0b307 100755
> --- a/configure
> +++ b/configure
> @@ -3964,7 +3964,7 @@ set >> $logfile
>  
>  test -n "$valgrind" && toolchain="valgrind-memcheck"
>  
> -enabled ossfuzz && ! echo $CFLAGS | grep -q -- "-fsanitize="  &&{
> +enabled ossfuzz && ! echo $CFLAGS | grep -q -- "-fsanitize="  && ! echo $CFLAGS | grep -q -- "-fcoverage-mapping" &&{

What part of configure adds -fcoverage-mapping? Or is this looking for a
user set cflag?

The subject should be more specific. This is specific for ossfuzz, not
other toolchains that add -fsanitize like asan/usan.

>      add_cflags  -fsanitize=address,undefined -fsanitize-coverage=trace-pc-guard,trace-cmp -fno-omit-frame-pointer
>      add_ldflags -fsanitize=address,undefined -fsanitize-coverage=trace-pc-guard,trace-cmp
>  }
>
Michael Niedermayer Aug. 21, 2018, 8:54 p.m. UTC | #2
On Mon, Aug 20, 2018 at 10:55:00AM -0300, James Almer wrote:
> On 8/19/2018 5:40 PM, Michael Niedermayer wrote:
> > Found-by: Max Moroz
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  configure | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/configure b/configure
> > index 9b5421d5a8..b9c9d0b307 100755
> > --- a/configure
> > +++ b/configure
> > @@ -3964,7 +3964,7 @@ set >> $logfile
> >  
> >  test -n "$valgrind" && toolchain="valgrind-memcheck"
> >  
> > -enabled ossfuzz && ! echo $CFLAGS | grep -q -- "-fsanitize="  &&{
> > +enabled ossfuzz && ! echo $CFLAGS | grep -q -- "-fsanitize="  && ! echo $CFLAGS | grep -q -- "-fcoverage-mapping" &&{
> 
> What part of configure adds -fcoverage-mapping? Or is this looking for a
> user set cflag?

user cflags


> 
> The subject should be more specific. This is specific for ossfuzz, not
> other toolchains that add -fsanitize like asan/usan.

what do you suggest ?

thx

[...]
James Almer Aug. 21, 2018, 8:59 p.m. UTC | #3
On 8/21/2018 5:54 PM, Michael Niedermayer wrote:
> On Mon, Aug 20, 2018 at 10:55:00AM -0300, James Almer wrote:
>> On 8/19/2018 5:40 PM, Michael Niedermayer wrote:
>>> Found-by: Max Moroz
>>> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
>>> ---
>>>  configure | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/configure b/configure
>>> index 9b5421d5a8..b9c9d0b307 100755
>>> --- a/configure
>>> +++ b/configure
>>> @@ -3964,7 +3964,7 @@ set >> $logfile
>>>  
>>>  test -n "$valgrind" && toolchain="valgrind-memcheck"
>>>  
>>> -enabled ossfuzz && ! echo $CFLAGS | grep -q -- "-fsanitize="  &&{
>>> +enabled ossfuzz && ! echo $CFLAGS | grep -q -- "-fsanitize="  && ! echo $CFLAGS | grep -q -- "-fcoverage-mapping" &&{
>>
>> What part of configure adds -fcoverage-mapping? Or is this looking for a
>> user set cflag?
> 
> user cflags
> 
> 
>>
>> The subject should be more specific. This is specific for ossfuzz, not
>> other toolchains that add -fsanitize like asan/usan.
> 
> what do you suggest ?

"configure: do not add fsanitize cflags with ossfuzz if coverage is
tested" or something like that. Just make it clear that this is not
directly related to the gcov/llvm-cov/usan/asan toolchains.

> 
> thx
> 
> [...]
> 
> 
> 
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
Michael Niedermayer Aug. 22, 2018, 6:38 p.m. UTC | #4
On Tue, Aug 21, 2018 at 05:59:00PM -0300, James Almer wrote:
> On 8/21/2018 5:54 PM, Michael Niedermayer wrote:
> > On Mon, Aug 20, 2018 at 10:55:00AM -0300, James Almer wrote:
> >> On 8/19/2018 5:40 PM, Michael Niedermayer wrote:
> >>> Found-by: Max Moroz
> >>> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> >>> ---
> >>>  configure | 2 +-
> >>>  1 file changed, 1 insertion(+), 1 deletion(-)
> >>>
> >>> diff --git a/configure b/configure
> >>> index 9b5421d5a8..b9c9d0b307 100755
> >>> --- a/configure
> >>> +++ b/configure
> >>> @@ -3964,7 +3964,7 @@ set >> $logfile
> >>>  
> >>>  test -n "$valgrind" && toolchain="valgrind-memcheck"
> >>>  
> >>> -enabled ossfuzz && ! echo $CFLAGS | grep -q -- "-fsanitize="  &&{
> >>> +enabled ossfuzz && ! echo $CFLAGS | grep -q -- "-fsanitize="  && ! echo $CFLAGS | grep -q -- "-fcoverage-mapping" &&{
> >>
> >> What part of configure adds -fcoverage-mapping? Or is this looking for a
> >> user set cflag?
> > 
> > user cflags
> > 
> > 
> >>
> >> The subject should be more specific. This is specific for ossfuzz, not
> >> other toolchains that add -fsanitize like asan/usan.
> > 
> > what do you suggest ?
> 
> "configure: do not add fsanitize cflags with ossfuzz if coverage is
> tested" or something like that. Just make it clear that this is not
> directly related to the gcov/llvm-cov/usan/asan toolchains.

ok, will apply with exactly that

thx

[...]
diff mbox

Patch

diff --git a/configure b/configure
index 9b5421d5a8..b9c9d0b307 100755
--- a/configure
+++ b/configure
@@ -3964,7 +3964,7 @@  set >> $logfile
 
 test -n "$valgrind" && toolchain="valgrind-memcheck"
 
-enabled ossfuzz && ! echo $CFLAGS | grep -q -- "-fsanitize="  &&{
+enabled ossfuzz && ! echo $CFLAGS | grep -q -- "-fsanitize="  && ! echo $CFLAGS | grep -q -- "-fcoverage-mapping" &&{
     add_cflags  -fsanitize=address,undefined -fsanitize-coverage=trace-pc-guard,trace-cmp -fno-omit-frame-pointer
     add_ldflags -fsanitize=address,undefined -fsanitize-coverage=trace-pc-guard,trace-cmp
 }