diff mbox series

[testsuite] tsvc: skip include malloc.h when unavailable

Message ID or8rdeqpgh.fsf@lxoliva.fsfla.org
State New
Headers show
Series [testsuite] tsvc: skip include malloc.h when unavailable | expand

Commit Message

Alexandre Oliva May 24, 2023, 5:16 a.m. UTC 
tsvc tests all fail on systems that don't offer a malloc.h, other than
those that explicitly rule that out.  Use the preprocessor to test for
malloc.h's availability.

tsvc.h also expects a definition for struct timeval, but it doesn't
include sys/time.h.  Add a conditional include thereof.

Bootstrapped on x86_64-linux-gnu.  Also tested on ppc- and x86-vx7r2
with gcc-12.


for  gcc/testsuite/ChangeLog

	* gcc.dg/vect/tsvc/tsvc.h: Test for and conditionally include
	malloc.h and sys/time.h.

---
 gcc/testsuite/gcc.dg/vect/tsvc/tsvc.h |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Richard Biener May 24, 2023, 9:02 a.m. UTC | #1 
On Wed, May 24, 2023 at 7:17 AM Alexandre Oliva via Gcc-patches
<gcc-patches@gcc.gnu.org> wrote:
>
>
> tsvc tests all fail on systems that don't offer a malloc.h, other than
> those that explicitly rule that out.  Use the preprocessor to test for
> malloc.h's availability.
>
> tsvc.h also expects a definition for struct timeval, but it doesn't
> include sys/time.h.  Add a conditional include thereof.
>
> Bootstrapped on x86_64-linux-gnu.  Also tested on ppc- and x86-vx7r2
> with gcc-12.

OK.

>
> for  gcc/testsuite/ChangeLog
>
>         * gcc.dg/vect/tsvc/tsvc.h: Test for and conditionally include
>         malloc.h and sys/time.h.
>
> ---
>  gcc/testsuite/gcc.dg/vect/tsvc/tsvc.h |    5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/tsvc.h b/gcc/testsuite/gcc.dg/vect/tsvc/tsvc.h
> index 75494c24cfa62..cd39c041903dd 100644
> --- a/gcc/testsuite/gcc.dg/vect/tsvc/tsvc.h
> +++ b/gcc/testsuite/gcc.dg/vect/tsvc/tsvc.h
> @@ -11,9 +11,12 @@
>
>  #include <stdio.h>
>  #include <stdlib.h>
> -#if !defined(__APPLE__) && !defined(__DragonFly__)
> +#if __has_include(<malloc.h>)
>  #include <malloc.h>
>  #endif
> +#if __has_include(<sys/time.h>)
> +#include <sys/time.h>
> +#endif
>  #include <string.h>
>  #include <math.h>
>
>
> --
> Alexandre Oliva, happy hacker                https://FSFLA.org/blogs/lxo/
>    Free Software Activist                       GNU Toolchain Engineer
> Disinformation flourishes because many people care deeply about injustice
> but very few check the facts.  Ask me about <https://stallmansupport.org>
Torbjorn SVENSSON Feb. 9, 2024, 10:33 a.m. UTC | #2 
Hi,

Is it okay to backport 2f20d6296087cae51f55eeecb3efefe786191fd6 to 
releases/gcc-13?

Without this backport, I see about 150 failures on arm-none-eabi, an 
example of them is:

FAIL: gcc.dg/vect/tsvc/vect-tsvc-s000.c (test for excess errors)


Kind regards,
Torbjörn

On 2023-05-24 11:02, Richard Biener via Gcc-patches wrote:
> On Wed, May 24, 2023 at 7:17 AM Alexandre Oliva via Gcc-patches
> <gcc-patches@gcc.gnu.org> wrote:
>>
>>
>> tsvc tests all fail on systems that don't offer a malloc.h, other than
>> those that explicitly rule that out.  Use the preprocessor to test for
>> malloc.h's availability.
>>
>> tsvc.h also expects a definition for struct timeval, but it doesn't
>> include sys/time.h.  Add a conditional include thereof.
>>
>> Bootstrapped on x86_64-linux-gnu.  Also tested on ppc- and x86-vx7r2
>> with gcc-12.
> 
> OK.
> 
>>
>> for  gcc/testsuite/ChangeLog
>>
>>          * gcc.dg/vect/tsvc/tsvc.h: Test for and conditionally include
>>          malloc.h and sys/time.h.
>>
>> ---
>>   gcc/testsuite/gcc.dg/vect/tsvc/tsvc.h |    5 ++++-
>>   1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/tsvc.h b/gcc/testsuite/gcc.dg/vect/tsvc/tsvc.h
>> index 75494c24cfa62..cd39c041903dd 100644
>> --- a/gcc/testsuite/gcc.dg/vect/tsvc/tsvc.h
>> +++ b/gcc/testsuite/gcc.dg/vect/tsvc/tsvc.h
>> @@ -11,9 +11,12 @@
>>
>>   #include <stdio.h>
>>   #include <stdlib.h>
>> -#if !defined(__APPLE__) && !defined(__DragonFly__)
>> +#if __has_include(<malloc.h>)
>>   #include <malloc.h>
>>   #endif
>> +#if __has_include(<sys/time.h>)
>> +#include <sys/time.h>
>> +#endif
>>   #include <string.h>
>>   #include <math.h>
>>
>>
>> --
>> Alexandre Oliva, happy hacker                https://FSFLA.org/blogs/lxo/
>>     Free Software Activist                       GNU Toolchain Engineer
>> Disinformation flourishes because many people care deeply about injustice
>> but very few check the facts.  Ask me about <https://stallmansupport.org>
Richard Biener Feb. 9, 2024, 10:34 a.m. UTC | #3 
On Fri, Feb 9, 2024 at 11:33 AM Torbjorn SVENSSON
<torbjorn.svensson@foss.st.com> wrote:
>
> Hi,
>
> Is it okay to backport 2f20d6296087cae51f55eeecb3efefe786191fd6 to
> releases/gcc-13?

Yes.

> Without this backport, I see about 150 failures on arm-none-eabi, an
> example of them is:
>
> FAIL: gcc.dg/vect/tsvc/vect-tsvc-s000.c (test for excess errors)
>
>
> Kind regards,
> Torbjörn
>
> On 2023-05-24 11:02, Richard Biener via Gcc-patches wrote:
> > On Wed, May 24, 2023 at 7:17 AM Alexandre Oliva via Gcc-patches
> > <gcc-patches@gcc.gnu.org> wrote:
> >>
> >>
> >> tsvc tests all fail on systems that don't offer a malloc.h, other than
> >> those that explicitly rule that out.  Use the preprocessor to test for
> >> malloc.h's availability.
> >>
> >> tsvc.h also expects a definition for struct timeval, but it doesn't
> >> include sys/time.h.  Add a conditional include thereof.
> >>
> >> Bootstrapped on x86_64-linux-gnu.  Also tested on ppc- and x86-vx7r2
> >> with gcc-12.
> >
> > OK.
> >
> >>
> >> for  gcc/testsuite/ChangeLog
> >>
> >>          * gcc.dg/vect/tsvc/tsvc.h: Test for and conditionally include
> >>          malloc.h and sys/time.h.
> >>
> >> ---
> >>   gcc/testsuite/gcc.dg/vect/tsvc/tsvc.h |    5 ++++-
> >>   1 file changed, 4 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/tsvc.h b/gcc/testsuite/gcc.dg/vect/tsvc/tsvc.h
> >> index 75494c24cfa62..cd39c041903dd 100644
> >> --- a/gcc/testsuite/gcc.dg/vect/tsvc/tsvc.h
> >> +++ b/gcc/testsuite/gcc.dg/vect/tsvc/tsvc.h
> >> @@ -11,9 +11,12 @@
> >>
> >>   #include <stdio.h>
> >>   #include <stdlib.h>
> >> -#if !defined(__APPLE__) && !defined(__DragonFly__)
> >> +#if __has_include(<malloc.h>)
> >>   #include <malloc.h>
> >>   #endif
> >> +#if __has_include(<sys/time.h>)
> >> +#include <sys/time.h>
> >> +#endif
> >>   #include <string.h>
> >>   #include <math.h>
> >>
> >>
> >> --
> >> Alexandre Oliva, happy hacker                https://FSFLA.org/blogs/lxo/
> >>     Free Software Activist                       GNU Toolchain Engineer
> >> Disinformation flourishes because many people care deeply about injustice
> >> but very few check the facts.  Ask me about <https://stallmansupport.org>
Torbjorn SVENSSON Feb. 9, 2024, 10:52 a.m. UTC | #4 
On 2024-02-09 11:34, Richard Biener wrote:
> On Fri, Feb 9, 2024 at 11:33 AM Torbjorn SVENSSON
> <torbjorn.svensson@foss.st.com> wrote:
>>
>> Hi,
>>
>> Is it okay to backport 2f20d6296087cae51f55eeecb3efefe786191fd6 to
>> releases/gcc-13?
> 
> Yes.

Pushed as 5b3dcff46780192a2e526bc434d61c8626898050.
diff mbox series

Patch

diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/tsvc.h b/gcc/testsuite/gcc.dg/vect/tsvc/tsvc.h
index 75494c24cfa62..cd39c041903dd 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/tsvc.h
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/tsvc.h
@@ -11,9 +11,12 @@ 
 
 #include <stdio.h>
 #include <stdlib.h>
-#if !defined(__APPLE__) && !defined(__DragonFly__)
+#if __has_include(<malloc.h>)
 #include <malloc.h>
 #endif
+#if __has_include(<sys/time.h>)
+#include <sys/time.h>
+#endif
 #include <string.h>
 #include <math.h>