Re: [PATCH] tests: fix for toolchains producing compressed debug sections

["Dmitry V. Levin" <ldv@altlinux.org>]

Hi Mark,

On Tue, Mar 23, 2021 at 04:05:59PM +0100, Mark Wielaard wrote:
> Hi Dmitry,
> 
> On Tue, 2021-03-23 at 17:28 +0300, Dmitry V. Levin wrote:
> > Yes, Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
> 
> Thanks, pushed.
> 
> But note that it broke the buildbot:
> https://builder.wildebeest.org/buildbot/#/builders/53/builds/2
> 
> Actually it was already broken, because that buildbot builder has an
> gcc so old that it doesn't know about -gdwarf-5.
> 
> But it also doesn't seem to know about -gz=none.
> 
> So we'll need configure checks for that and not use -gz=none and skip
> the -gdwarf-5 tests when gcc isn't able to use those options.
> 
> Cheers,

I've prepared the following fix, but it seems to be too late now.
I'll post it here anyway just in case.

From 53dfef243aa1de8331db777fe031129d5098f516 Mon Sep 17 00:00:00 2001
From: "Dmitry V. Levin" <ldv@altlinux.org>
Date: Tue, 23 Mar 2021 20:00:00 +0000
Subject: [PATCH] tests: skip debugedit tests that require unsupported gcc
 options

* tests/debugedit.at (RPM_DEBUGEDIT_SETUP): Do not use -gz=none if
gcc does not support it.  Skip the test if gcc does not support
the parameters passed to RPM_DEBUGEDIT_SETUP.

Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
---
 tests/debugedit.at | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/tests/debugedit.at b/tests/debugedit.at
index 2d1870b..2e72c89 100644
--- a/tests/debugedit.at
+++ b/tests/debugedit.at
@@ -23,7 +23,7 @@ AT_TESTED([debugedit])
 
 # Helper to create some test binaries.
 # Optional parameter can specify additional gcc parameters.
-m4_define([RPM_DEBUGEDIT_SETUP],[[
+m4_define([RPM_DEBUGEDIT_SETUP],[
 # Create some test binaries. Create and build them in different subdirs
 # to make sure they produce different relative/absolute paths.
 
@@ -36,12 +36,21 @@ mkdir subdir_headers
 cp "${abs_srcdir}"/data/SOURCES/foobar.h subdir_headers
 cp "${abs_srcdir}"/data/SOURCES/baz.c .
 
+for cc_debug_opts in "-g3 -gz=none $1" "-g3 $1"; do
+	if gcc $cc_debug_opts $1 -c -xc /dev/null -o /dev/null; then
+		break
+	else
+		cc_debug_opts=''
+	fi
+done
+AT_SKIP_IF([test -z "$cc_debug_opts"])
+
 # First three object files (foo.o subdir_bar/bar.o and baz.o)
-gcc -g3 -gz=none -Isubdir_headers $1 -c subdir_foo/foo.c
+gcc ${cc_debug_opts} -Isubdir_headers -c subdir_foo/foo.c
 cd subdir_bar
-gcc -g3 -gz=none -I../subdir_headers $1 -c bar.c
+gcc ${cc_debug_opts} -I../subdir_headers -c bar.c
 cd ..
-gcc -g3 -gz=none -I$(pwd)/subdir_headers $1 -c $(pwd)/baz.c
+gcc ${cc_debug_opts} -I$(pwd)/subdir_headers -c $(pwd)/baz.c
 
 # Then a partially linked object file (somewhat like a kernel module).
 # This will still have relocations between the debug sections.
@@ -49,8 +58,8 @@ ld -r -o foobarbaz.part.o foo.o subdir_bar/bar.o baz.o
 
 # Create an executable. Relocations between debug sections will
 # have been resolved.
-gcc -g3 -gz=none -o foobarbaz.exe foo.o subdir_bar/bar.o baz.o
-]])
+gcc ${cc_debug_opts} -o foobarbaz.exe foo.o subdir_bar/bar.o baz.o
+])
 
 # ===
 # Check debugedit --help doesn't crash and burn.
-- 
ldv