Skip to content

Commit bc78542

Browse files
libbacktrace: don't let "make clean" remove allocfail.sh
* Makefile.am (MAKETESTS): New variable split out of TESTS. (CLEANFILES): Replace TESTS with BUILDTESTS and MAKETESTS. * Makefile.in: Regenerate. Fixes msysgit#81
1 parent b6ddb3a commit bc78542

File tree

2 files changed

+27
-15
lines changed

2 files changed

+27
-15
lines changed

Makefile.am

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,19 @@ libbacktrace_la_DEPENDENCIES = $(libbacktrace_la_LIBADD)
8686

8787
# Testsuite.
8888

89-
# Add a test to this variable if you want it to be built.
89+
# Add a test to this variable if you want it to be built as a program,
90+
# with SOURCES, etc.
9091
check_PROGRAMS =
9192

9293
# Add a test to this variable if you want it to be run.
9394
TESTS =
9495

95-
# Add a test to this variable if you want it to be built and run.
96+
# Add a test to this variable if you want it to be built as a Makefile
97+
# target and run.
98+
MAKETESTS =
99+
100+
# Add a test to this variable if you want it to be built as a program,
101+
# with SOURCES, etc., and run.
96102
BUILDTESTS =
97103

98104
# Add a file to this variable if you want it to be built for testing.
@@ -251,7 +257,7 @@ b2test_LDFLAGS = -Wl,--build-id
251257
b2test_LDADD = libbacktrace_elf_for_test.la
252258

253259
check_PROGRAMS += b2test
254-
TESTS += b2test_buildid
260+
MAKETESTS += b2test_buildid
255261

256262
if HAVE_DWZ
257263

@@ -261,7 +267,7 @@ b3test_LDFLAGS = -Wl,--build-id
261267
b3test_LDADD = libbacktrace_elf_for_test.la
262268

263269
check_PROGRAMS += b3test
264-
TESTS += b3test_dwz_buildid
270+
MAKETESTS += b3test_dwz_buildid
265271

266272
endif HAVE_DWZ
267273

@@ -312,11 +318,11 @@ if HAVE_DWZ
312318
cp $< $@; \
313319
fi
314320

315-
TESTS += btest_dwz
321+
MAKETESTS += btest_dwz
316322

317323
if HAVE_OBJCOPY_DEBUGLINK
318324

319-
TESTS += btest_dwz_gnudebuglink
325+
MAKETESTS += btest_dwz_gnudebuglink
320326

321327
endif HAVE_OBJCOPY_DEBUGLINK
322328

@@ -417,7 +423,7 @@ endif HAVE_PTHREAD
417423

418424
if HAVE_OBJCOPY_DEBUGLINK
419425

420-
TESTS += btest_gnudebuglink
426+
MAKETESTS += btest_gnudebuglink
421427

422428
%_gnudebuglink: %
423429
$(OBJCOPY) --only-keep-debug $< $@.debug
@@ -495,7 +501,7 @@ endif USE_DSYMUTIL
495501

496502
if HAVE_MINIDEBUG
497503

498-
TESTS += mtest_minidebug
504+
MAKETESTS += mtest_minidebug
499505

500506
%_minidebug: %
501507
$(NM) -D $< -P --defined-only | $(AWK) '{ print $$1 }' | sort > $<.dsyms
@@ -537,10 +543,11 @@ endif HAVE_ELF
537543

538544
check_PROGRAMS += $(BUILDTESTS)
539545

540-
TESTS += $(BUILDTESTS)
546+
TESTS += $(MAKETESTS) $(BUILDTESTS)
541547

542548
CLEANFILES = \
543-
$(TESTS) *.debug elf_for_test.c edtest2_build.c gen_edtest2_build \
549+
$(MAKETESTS) $(BUILDTESTS) *.debug elf_for_test.c edtest2_build.c \
550+
gen_edtest2_build \
544551
*.dsyms *.fsyms *.keepsyms *.dbg *.mdbg *.mdbg.xz *.strip
545552

546553
clean-local:

Makefile.in

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,7 @@ host_triplet = @host@
123123
target_triplet = @target@
124124
check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
125125
$(am__EXEEXT_14)
126-
TESTS = $(am__append_4) $(am__append_7) $(am__append_9) \
127-
$(am__append_12) $(am__append_13) $(am__append_20) \
128-
$(am__append_26) $(am__EXEEXT_14)
126+
TESTS = $(am__append_4) $(MAKETESTS) $(am__EXEEXT_14)
129127
@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__append_1 = libbacktrace_elf_for_test.la
130128
@NATIVE_TRUE@am__append_2 = test_elf_32 test_elf_64 test_macho \
131129
@NATIVE_TRUE@ test_xcoff_32 test_xcoff_64 test_pecoff \
@@ -987,7 +985,13 @@ libbacktrace_la_LIBADD = \
987985

988986
libbacktrace_la_DEPENDENCIES = $(libbacktrace_la_LIBADD)
989987

990-
# Add a test to this variable if you want it to be built and run.
988+
# Add a test to this variable if you want it to be built as a Makefile
989+
# target and run.
990+
MAKETESTS = $(am__append_7) $(am__append_9) $(am__append_12) \
991+
$(am__append_13) $(am__append_20) $(am__append_26)
992+
993+
# Add a test to this variable if you want it to be built as a program,
994+
# with SOURCES, etc., and run.
991995
BUILDTESTS = $(am__append_2) $(am__append_10) $(am__append_11) \
992996
$(am__append_16) $(am__append_17) $(am__append_18) \
993997
$(am__append_21) $(am__append_22) $(am__append_24) \
@@ -1129,7 +1133,8 @@ libbacktrace_TEST_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) -g
11291133
@HAVE_ELF_TRUE@xztest_alloc_LDADD = libbacktrace_alloc.la \
11301134
@HAVE_ELF_TRUE@ $(am__append_28) $(CLOCK_GETTIME_LINK)
11311135
CLEANFILES = \
1132-
$(TESTS) *.debug elf_for_test.c edtest2_build.c gen_edtest2_build \
1136+
$(MAKETESTS) $(BUILDTESTS) *.debug elf_for_test.c edtest2_build.c \
1137+
gen_edtest2_build \
11331138
*.dsyms *.fsyms *.keepsyms *.dbg *.mdbg *.mdbg.xz *.strip
11341139

11351140
all: config.h

0 commit comments

Comments
 (0)