Skip to content

Commit dedbe13

Browse files
libbacktrace: don't fail tests if dwz fails
* Makefile.am (%_dwz): If dwz fails, use uncompressed debug info. * Makefile.in: Regenerate.
1 parent 0966504 commit dedbe13

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

Makefile.am

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -304,9 +304,13 @@ if HAVE_DWZ
304304
rm -f $@ $@_common.debug
305305
cp $< $@_1
306306
cp $< $@_2
307-
$(DWZ) -m $@_common.debug $@_1 $@_2
308-
rm -f $@_2
309-
mv $@_1 $@
307+
if $(DWZ) -m $@_common.debug $@_1 $@_2; then \
308+
rm -f $@_2; \
309+
mv $@_1 $@; \
310+
else \
311+
echo "Ignoring dwz errors, assuming that test passes"; \
312+
cp $< $@; \
313+
fi
310314

311315
TESTS += btest_dwz
312316

Makefile.in

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
@SET_MAKE@
1616

1717
# Makefile.am -- Backtrace Makefile.
18-
# Copyright (C) 2012-2020 Free Software Foundation, Inc.
18+
# Copyright (C) 2012-2021 Free Software Foundation, Inc.
1919

2020
# Redistribution and use in source and binary forms, with or without
2121
# modification, are permitted provided that the following conditions are
@@ -2459,9 +2459,13 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
24592459
@HAVE_DWZ_TRUE@@NATIVE_TRUE@ rm -f $@ $@_common.debug
24602460
@HAVE_DWZ_TRUE@@NATIVE_TRUE@ cp $< $@_1
24612461
@HAVE_DWZ_TRUE@@NATIVE_TRUE@ cp $< $@_2
2462-
@HAVE_DWZ_TRUE@@NATIVE_TRUE@ $(DWZ) -m $@_common.debug $@_1 $@_2
2463-
@HAVE_DWZ_TRUE@@NATIVE_TRUE@ rm -f $@_2
2464-
@HAVE_DWZ_TRUE@@NATIVE_TRUE@ mv $@_1 $@
2462+
@HAVE_DWZ_TRUE@@NATIVE_TRUE@ if $(DWZ) -m $@_common.debug $@_1 $@_2; then \
2463+
@HAVE_DWZ_TRUE@@NATIVE_TRUE@ rm -f $@_2; \
2464+
@HAVE_DWZ_TRUE@@NATIVE_TRUE@ mv $@_1 $@; \
2465+
@HAVE_DWZ_TRUE@@NATIVE_TRUE@ else \
2466+
@HAVE_DWZ_TRUE@@NATIVE_TRUE@ echo "Ignoring dwz errors, assuming that test passes"; \
2467+
@HAVE_DWZ_TRUE@@NATIVE_TRUE@ cp $< $@; \
2468+
@HAVE_DWZ_TRUE@@NATIVE_TRUE@ fi
24652469

24662470
@NATIVE_TRUE@edtest2_build.c: gen_edtest2_build; @true
24672471
@NATIVE_TRUE@gen_edtest2_build: $(srcdir)/edtest2.c

0 commit comments

Comments
 (0)