Skip to content
This repository was archived by the owner on Apr 2, 2024. It is now read-only.

Commit 929d620

Browse files
libbacktrace: always pass -g when compiling test code
This approach required adding a few casts to ztest.c, as it is now compiled with -Wall. Fixes GCC PR libbacktrace/90636
1 parent bd02146 commit 929d620

File tree

3 files changed

+305
-64
lines changed

3 files changed

+305
-64
lines changed

Makefile.am

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,9 @@ TESTS =
9494
# Add test to this variable, if you want it to be build and run.
9595
BUILDTESTS =
9696

97+
# Flags to use when compiling test programs.
98+
libbacktrace_TEST_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) -g
99+
97100
if NATIVE
98101
check_LTLIBRARIES = libbacktrace_alloc.la
99102

@@ -150,41 +153,49 @@ xcoff_%.c: xcoff.c
150153
mv $@.tmp $@
151154

152155
test_elf_32_SOURCES = test_format.c testlib.c
156+
test_elf_32_CFLAGS = $(libbacktrace_TEST_CFLAGS)
153157
test_elf_32_LDADD = libbacktrace_noformat.la elf_32.lo
154158

155159
BUILDTESTS += test_elf_32
156160

157161
test_elf_64_SOURCES = test_format.c testlib.c
162+
test_elf_64_CFLAGS = $(libbacktrace_TEST_CFLAGS)
158163
test_elf_64_LDADD = libbacktrace_noformat.la elf_64.lo
159164

160165
BUILDTESTS += test_elf_64
161166

162167
test_xcoff_32_SOURCES = test_format.c testlib.c
168+
test_xcoff_32_CFLAGS = $(libbacktrace_TEST_CFLAGS)
163169
test_xcoff_32_LDADD = libbacktrace_noformat.la xcoff_32.lo
164170

165171
BUILDTESTS += test_xcoff_32
166172

167173
test_xcoff_64_SOURCES = test_format.c testlib.c
174+
test_xcoff_64_CFLAGS = $(libbacktrace_TEST_CFLAGS)
168175
test_xcoff_64_LDADD = libbacktrace_noformat.la xcoff_64.lo
169176

170177
BUILDTESTS += test_xcoff_64
171178

172179
test_pecoff_SOURCES = test_format.c testlib.c
180+
test_pecoff_CFLAGS = $(libbacktrace_TEST_CFLAGS)
173181
test_pecoff_LDADD = libbacktrace_noformat.la pecoff.lo
174182

175183
BUILDTESTS += test_pecoff
176184

177185
test_unknown_SOURCES = test_format.c testlib.c
186+
test_unknown_CFLAGS = $(libbacktrace_TEST_CFLAGS)
178187
test_unknown_LDADD = libbacktrace_noformat.la unknown.lo
179188

180189
BUILDTESTS += test_unknown
181190

182191
unittest_SOURCES = unittest.c testlib.c
192+
unittest_CFLAGS = $(libbacktrace_TEST_CFLAGS)
183193
unittest_LDADD = libbacktrace.la
184194

185195
BUILDTESTS += unittest
186196

187197
unittest_alloc_SOURCES = $(unittest_SOURCES)
198+
unittest_alloc_CFLAGS = $(libbacktrace_TEST_CFLAGS)
188199
unittest_alloc_LDADD = libbacktrace_alloc.la
189200

190201
BUILDTESTS += unittest_alloc
@@ -201,6 +212,7 @@ libbacktrace_instrumented_alloc_la_DEPENDENCIES = \
201212
instrumented_alloc.lo: alloc.c
202213

203214
allocfail_SOURCES = allocfail.c testlib.c
215+
allocfail_CFLAGS = $(libbacktrace_TEST_CFLAGS)
204216
allocfail_LDADD = libbacktrace_instrumented_alloc.la
205217

206218
check_PROGRAMS += allocfail
@@ -213,7 +225,7 @@ if HAVE_ELF
213225
if HAVE_OBJCOPY_DEBUGLINK
214226

215227
b2test_SOURCES = $(btest_SOURCES)
216-
b2test_CFLAGS = $(btest_CFLAGS)
228+
b2test_CFLAGS = $(libbacktrace_TEST_CFLAGS)
217229
b2test_LDFLAGS = -Wl,--build-id
218230
b2test_LDADD = libbacktrace_elf_for_test.la
219231

@@ -223,7 +235,7 @@ TESTS += b2test_buildid
223235
if HAVE_DWZ
224236

225237
b3test_SOURCES = $(btest_SOURCES)
226-
b3test_CFLAGS = $(btest_CFLAGS)
238+
b3test_CFLAGS = $(libbacktrace_TEST_CFLAGS)
227239
b3test_LDFLAGS = -Wl,--build-id
228240
b3test_LDADD = libbacktrace_elf_for_test.la
229241

@@ -236,23 +248,23 @@ endif HAVE_OBJCOPY_DEBUGLINK
236248
endif HAVE_ELF
237249

238250
btest_SOURCES = btest.c testlib.c
239-
btest_CFLAGS = $(AM_CFLAGS) -g -O
251+
btest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -O
240252
btest_LDADD = libbacktrace.la
241253

242254
BUILDTESTS += btest
243255

244256
if HAVE_ELF
245257

246258
btest_lto_SOURCES = btest.c testlib.c
247-
btest_lto_CFLAGS = $(AM_CFLAGS) -g -O -flto
259+
btest_lto_CFLAGS = $(libbacktrace_TEST_CFLAGS) -O -flto
248260
btest_lto_LDADD = libbacktrace.la
249261

250262
BUILDTESTS += btest_lto
251263

252264
endif HAVE_ELF
253265

254266
btest_alloc_SOURCES = $(btest_SOURCES)
255-
btest_alloc_CFLAGS = $(btest_CFLAGS)
267+
btest_alloc_CFLAGS = $(libbacktrace_TEST_CFLAGS)
256268
btest_alloc_LDADD = libbacktrace_alloc.la
257269

258270
BUILDTESTS += btest_alloc
@@ -278,19 +290,21 @@ endif HAVE_OBJCOPY_DEBUGLINK
278290
endif HAVE_DWZ
279291

280292
stest_SOURCES = stest.c
293+
stest_CFLAGS = $(libbacktrace_TEST_CFLAGS)
281294
stest_LDADD = libbacktrace.la
282295

283296
BUILDTESTS += stest
284297

285298
stest_alloc_SOURCES = $(stest_SOURCES)
299+
stest_alloc_CFLAGS = $(libbacktrace_TEST_CFLAGS)
286300
stest_alloc_LDADD = libbacktrace_alloc.la
287301

288302
BUILDTESTS += stest_alloc
289303

290304
if HAVE_ELF
291305

292306
ztest_SOURCES = ztest.c testlib.c
293-
ztest_CFLAGS = -DSRCDIR=\"$(srcdir)\"
307+
ztest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -DSRCDIR=\"$(srcdir)\"
294308
ztest_LDADD = libbacktrace.la
295309
ztest_alloc_LDADD = libbacktrace_alloc.la
296310

@@ -311,11 +325,13 @@ BUILDTESTS += ztest_alloc
311325
endif HAVE_ELF
312326

313327
edtest_SOURCES = edtest.c edtest2_build.c testlib.c
328+
edtest_CFLAGS = $(libbacktrace_TEST_CFLAGS)
314329
edtest_LDADD = libbacktrace.la
315330

316331
BUILDTESTS += edtest
317332

318333
edtest_alloc_SOURCES = $(edtest_SOURCES)
334+
edtest_alloc_CFLAGS = $(libbacktrace_TEST_CFLAGS)
319335
edtest_alloc_LDADD = libbacktrace_alloc.la
320336

321337
BUILDTESTS += edtest_alloc
@@ -331,7 +347,7 @@ if HAVE_PTHREAD
331347
BUILDTESTS += ttest
332348

333349
ttest_SOURCES = ttest.c testlib.c
334-
ttest_CFLAGS = $(AM_CFLAGS) -pthread
350+
ttest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -pthread
335351
ttest_LDADD = libbacktrace.la
336352

337353
BUILDTESTS += ttest_alloc
@@ -361,12 +377,12 @@ endif HAVE_OBJCOPY_DEBUGLINK
361377
if HAVE_COMPRESSED_DEBUG
362378

363379
ctestg_SOURCES = btest.c testlib.c
364-
ctestg_CFLAGS = $(AM_CFLAGS) -g
380+
ctestg_CFLAGS = $(libbacktrace_TEST_CFLAGS)
365381
ctestg_LDFLAGS = -Wl,--compress-debug-sections=zlib-gnu
366382
ctestg_LDADD = libbacktrace.la
367383

368384
ctesta_SOURCES = btest.c testlib.c
369-
ctesta_CFLAGS = $(AM_CFLAGS) -g
385+
ctesta_CFLAGS = $(libbacktrace_TEST_CFLAGS)
370386
ctesta_LDFLAGS = -Wl,--compress-debug-sections=zlib-gabi
371387
ctesta_LDADD = libbacktrace.la
372388

@@ -389,7 +405,7 @@ endif
389405
if HAVE_DWARF5
390406

391407
dwarf5_SOURCES = btest.c testlib.c
392-
dwarf5_CFLAGS = $(AM_CFLAGS) -gdwarf-5
408+
dwarf5_CFLAGS = $(libbacktrace_TEST_CFLAGS) -gdwarf-5
393409
dwarf5_LDADD = libbacktrace.la
394410

395411
BUILDTESTS += dwarf5

0 commit comments

Comments
 (0)