diff mbox series

Fix test errors introduced with fix for PR115157

Message ID 0f6bc7aacf6407b4fcdcb10c9d99f10292461a19.camel@tugraz.at
State New
Headers show
Series Fix test errors introduced with fix for PR115157 | expand

Commit Message

Martin Uecker June 23, 2024, 11:10 a.m. UTC
This should fix the test failures introduced by the fix for PR115157.

Tested on x86_64 and also tested with -m32.


    Fix test errors introduced with fix for PR115157.
    
    Fix tests introduced when fixing PR115157 that assume sizeof(enum)==sizeof(int)
    by adding the flag -fno-short-enums.
    
    gcc/testsuite/Changelog:
            * gcc.dg/enum-alias-1.c: Add flag.
            * gcc.dg/enum-alias-2.c: Add flag.
            * gcc.dg/enum-alias-3.c: Add flag.
            * gcc.dg/enum-alias-4.c: Add flag.

Comments

Thiago Jung Bauermann July 1, 2024, 5:29 p.m. UTC | #1
Hello Martin,

Martin Uecker <uecker@tugraz.at> writes:

> This should fix the test failures introduced by the fix for PR115157.
>
> Tested on x86_64 and also tested with -m32.
>
>
>     Fix test errors introduced with fix for PR115157.
>     
>     Fix tests introduced when fixing PR115157 that assume sizeof(enum)==sizeof(int)
>     by adding the flag -fno-short-enums.
>     
>     gcc/testsuite/Changelog:
>             * gcc.dg/enum-alias-1.c: Add flag.
>             * gcc.dg/enum-alias-2.c: Add flag.
>             * gcc.dg/enum-alias-3.c: Add flag.
>             * gcc.dg/enum-alias-4.c: Add flag.

Thank you for the patch! It fixes the execution test failures but
unfortunately they still have excess errors failures due to an
unexpected linker warning:

spawn -ignore SIGHUP /home/tcwg-build/workspace/tcwg_gnu_0/abe/builds/destdir/x86_64-pc-linux-gnu/bin/arm-eabi-gcc /home/tcwg-build/workspace/tcwg_gnu_0/abe/snapshots/gcc.git~master/gcc/testsuite/gcc.dg/enum-alias-1.c -fdiagnostics-plain-output -O2 -fno-short-enums -specs=rdimon.specs -lm -o ./enum-alias-1.exe
/home/tcwg-build/workspace/tcwg_gnu_0/abe/builds/destdir/x86_64-pc-linux-gnu/lib/gcc/arm-eabi/15.0.0/../../../../arm-eabi/bin/ld: warning: /tmp/ccP9AJZd.o uses 32-bit enums yet the output is to use variable-size enums; use of enum values across objects may fail
    ⋮
FAIL: gcc.dg/enum-alias-1.c (test for excess errors)
Excess errors:
/home/tcwg-build/workspace/tcwg_gnu_0/abe/builds/destdir/x86_64-pc-linux-gnu/lib/gcc/arm-eabi/15.0.0/../../../../arm-eabi/bin/ld: warning: /tmp/ccP9AJZd.o uses 32-bit enums yet the output is to use variable-size enums; use of enum values across objects may fail

The same happens with gcc.dg/enum-alias-[234].c.
Martin Uecker July 6, 2024, 10:55 a.m. UTC | #2
Am Montag, dem 01.07.2024 um 14:29 -0300 schrieb Thiago Jung Bauermann:
> Hello Martin,
> 
> Martin Uecker <uecker@tugraz.at> writes:
> 
> > This should fix the test failures introduced by the fix for PR115157.
> > 
> > Tested on x86_64 and also tested with -m32.
> > 
> > 
> >     Fix test errors introduced with fix for PR115157.
> >     
> >     Fix tests introduced when fixing PR115157 that assume sizeof(enum)==sizeof(int)
> >     by adding the flag -fno-short-enums.
> >     
> >     gcc/testsuite/Changelog:
> >             * gcc.dg/enum-alias-1.c: Add flag.
> >             * gcc.dg/enum-alias-2.c: Add flag.
> >             * gcc.dg/enum-alias-3.c: Add flag.
> >             * gcc.dg/enum-alias-4.c: Add flag.
> 
> Thank you for the patch! It fixes the execution test failures but
> unfortunately they still have excess errors failures due to an
> unexpected linker warning:
> 
> spawn -ignore SIGHUP /home/tcwg-build/workspace/tcwg_gnu_0/abe/builds/destdir/x86_64-pc-linux-gnu/bin/arm-eabi-gcc /home/tcwg-build/workspace/tcwg_gnu_0/abe/snapshots/gcc.git~master/gcc/testsuite/gcc.dg/enum-alias-1.c -fdiagnostics-plain-output -O2 -fno-short-enums -specs=rdimon.specs -lm -o ./enum-alias-1.exe
> /home/tcwg-build/workspace/tcwg_gnu_0/abe/builds/destdir/x86_64-pc-linux-gnu/lib/gcc/arm-eabi/15.0.0/../../../../arm-eabi/bin/ld: warning: /tmp/ccP9AJZd.o uses 32-bit enums yet the output is to use variable-size enums; use of enum values across objects may fail
>     ⋮
> FAIL: gcc.dg/enum-alias-1.c (test for excess errors)
> Excess errors:
> /home/tcwg-build/workspace/tcwg_gnu_0/abe/builds/destdir/x86_64-pc-linux-gnu/lib/gcc/arm-eabi/15.0.0/../../../../arm-eabi/bin/ld: warning: /tmp/ccP9AJZd.o uses 32-bit enums yet the output is to use variable-size enums; use of enum values across objects may fail
> 
> The same happens with gcc.dg/enum-alias-[234].c.

Thank you!

BTW: Did you try the other testsuite patch as well?

[PATCH] Fix test errors after r15-1394 for sizeof(int)==sizeof(long) [PR115545]

Best,
Martin

>
Thiago Jung Bauermann July 9, 2024, 10:11 p.m. UTC | #3
Hello Martin,

Martin Uecker <uecker@tugraz.at> writes:

> BTW: Did you try the other testsuite patch as well?
>
> [PATCH] Fix test errors after r15-1394 for sizeof(int)==sizeof(long) [PR115545]

I hadn't, but I did today and the patch is good from our CI's
perspective. I replied directly to its email thread.
Martin Uecker July 10, 2024, 6:20 a.m. UTC | #4
Am Dienstag, dem 09.07.2024 um 19:11 -0300 schrieb Thiago Jung Bauermann:
> Hello Martin,
> 
> Martin Uecker <uecker@tugraz.at> writes:
> 
> > BTW: Did you try the other testsuite patch as well?
> > 
> > [PATCH] Fix test errors after r15-1394 for sizeof(int)==sizeof(long) [PR115545]
> 
> I hadn't, but I did today and the patch is good from our CI's
> perspective. I replied directly to its email thread.

Thank you!
diff mbox series

Patch

diff --git a/gcc/testsuite/gcc.dg/enum-alias-1.c b/gcc/testsuite/gcc.dg/enum-alias-1.c
index 8fa30eb7897..725d88580b8 100644
--- a/gcc/testsuite/gcc.dg/enum-alias-1.c
+++ b/gcc/testsuite/gcc.dg/enum-alias-1.c
@@ -1,5 +1,5 @@ 
 /* { dg-do run } */
-/* { dg-options "-O2" } */
+/* { dg-options "-O2 -fno-short-enums" } */
 
 enum E { E1 = -1, E2 = 0, E3 = 1 };
 
diff --git a/gcc/testsuite/gcc.dg/enum-alias-2.c b/gcc/testsuite/gcc.dg/enum-alias-2.c
index 7ca3f3b2db8..d988c5ee698 100644
--- a/gcc/testsuite/gcc.dg/enum-alias-2.c
+++ b/gcc/testsuite/gcc.dg/enum-alias-2.c
@@ -1,5 +1,5 @@ 
 /* { dg-do run } */
-/* { dg-options "-O2" } */
+/* { dg-options "-O2 -fno-short-enums" } */
 
 typedef int A;
 
diff --git a/gcc/testsuite/gcc.dg/enum-alias-3.c b/gcc/testsuite/gcc.dg/enum-alias-3.c
index 36a4f02a455..4dbf0c9293a 100644
--- a/gcc/testsuite/gcc.dg/enum-alias-3.c
+++ b/gcc/testsuite/gcc.dg/enum-alias-3.c
@@ -1,5 +1,5 @@ 
 /* { dg-do run } */
-/* { dg-options "-O2 -flto" } */
+/* { dg-options "-O2 -flto -fno-short-enums" } */
 
 typedef int *A;
 
diff --git a/gcc/testsuite/gcc.dg/enum-alias-4.c b/gcc/testsuite/gcc.dg/enum-alias-4.c
index b78d0451e3e..a1a8613fca0 100644
--- a/gcc/testsuite/gcc.dg/enum-alias-4.c
+++ b/gcc/testsuite/gcc.dg/enum-alias-4.c
@@ -1,5 +1,5 @@ 
 /* { dg-do run } */
-/* { dg-options "-O2" } */
+/* { dg-options "-O2 -fno-short-enums" } */
 
 typedef int A;
 typedef int __attribute__ (( hardbool(0, 1) )) B;