122 lines
6.2 KiB
Diff
122 lines
6.2 KiB
Diff
the 'os wrappers' test fails when compiling statically with musl due to the
|
|
creation of a duplicate symbol.
|
|
|
|
--- a/Makefile.in 2020-02-11 23:46:12.000000000 +0000
|
|
+++ b/Makefile.in 2020-09-04 00:13:35.070000000 +0000
|
|
@@ -146,7 +146,6 @@
|
|
@ENABLE_LIBRARIES_TRUE@ fixed-test$(EXEEXT) \
|
|
@ENABLE_LIBRARIES_TRUE@ interface-test$(EXEEXT) \
|
|
@ENABLE_LIBRARIES_TRUE@ list-test$(EXEEXT) map-test$(EXEEXT) \
|
|
-@ENABLE_LIBRARIES_TRUE@ os-wrappers-test$(EXEEXT) \
|
|
@ENABLE_LIBRARIES_TRUE@ sanity-test$(EXEEXT) \
|
|
@ENABLE_LIBRARIES_TRUE@ socket-test$(EXEEXT) \
|
|
@ENABLE_LIBRARIES_TRUE@ queue-test$(EXEEXT) proxy-test$(EXEEXT) \
|
|
@@ -393,12 +392,6 @@
|
|
newsignal_test_OBJECTS = $(am_newsignal_test_OBJECTS)
|
|
@ENABLE_LIBRARIES_TRUE@newsignal_test_DEPENDENCIES = \
|
|
@ENABLE_LIBRARIES_TRUE@ libtest-runner.la
|
|
-am__os_wrappers_test_SOURCES_DIST = tests/os-wrappers-test.c
|
|
-@ENABLE_LIBRARIES_TRUE@am_os_wrappers_test_OBJECTS = \
|
|
-@ENABLE_LIBRARIES_TRUE@ tests/os-wrappers-test.$(OBJEXT)
|
|
-os_wrappers_test_OBJECTS = $(am_os_wrappers_test_OBJECTS)
|
|
-@ENABLE_LIBRARIES_TRUE@os_wrappers_test_DEPENDENCIES = \
|
|
-@ENABLE_LIBRARIES_TRUE@ libtest-runner.la
|
|
am__protocol_logger_test_SOURCES_DIST = tests/protocol-logger-test.c
|
|
@ENABLE_LIBRARIES_TRUE@am_protocol_logger_test_OBJECTS = \
|
|
@ENABLE_LIBRARIES_TRUE@ tests/protocol-logger-test.$(OBJEXT)
|
|
@@ -502,7 +495,6 @@
|
|
tests/$(DEPDIR)/interface-test.Po tests/$(DEPDIR)/list-test.Po \
|
|
tests/$(DEPDIR)/map-test.Po tests/$(DEPDIR)/message-test.Po \
|
|
tests/$(DEPDIR)/newsignal-test.Po \
|
|
- tests/$(DEPDIR)/os-wrappers-test.Po \
|
|
tests/$(DEPDIR)/protocol-logger-test.Po \
|
|
tests/$(DEPDIR)/proxy-test.Po tests/$(DEPDIR)/queue-test.Po \
|
|
tests/$(DEPDIR)/resources-test.Po \
|
|
@@ -575,7 +567,7 @@
|
|
$(headers_test_SOURCES) $(nodist_headers_test_SOURCES) \
|
|
$(interface_test_SOURCES) $(list_test_SOURCES) \
|
|
$(map_test_SOURCES) $(message_test_SOURCES) \
|
|
- $(newsignal_test_SOURCES) $(os_wrappers_test_SOURCES) \
|
|
+ $(newsignal_test_SOURCES) \
|
|
$(protocol_logger_test_SOURCES) $(proxy_test_SOURCES) \
|
|
$(queue_test_SOURCES) $(resources_test_SOURCES) \
|
|
$(sanity_test_SOURCES) $(signal_test_SOURCES) \
|
|
@@ -603,7 +595,6 @@
|
|
$(am__list_test_SOURCES_DIST) $(am__map_test_SOURCES_DIST) \
|
|
$(am__message_test_SOURCES_DIST) \
|
|
$(am__newsignal_test_SOURCES_DIST) \
|
|
- $(am__os_wrappers_test_SOURCES_DIST) \
|
|
$(am__protocol_logger_test_SOURCES_DIST) \
|
|
$(am__proxy_test_SOURCES_DIST) $(am__queue_test_SOURCES_DIST) \
|
|
$(am__resources_test_SOURCES_DIST) \
|
|
@@ -1182,7 +1173,6 @@
|
|
@ENABLE_LIBRARIES_TRUE@ display-test connection-test \
|
|
@ENABLE_LIBRARIES_TRUE@ event-loop-test fixed-test \
|
|
@ENABLE_LIBRARIES_TRUE@ interface-test list-test map-test \
|
|
-@ENABLE_LIBRARIES_TRUE@ os-wrappers-test sanity-test \
|
|
@ENABLE_LIBRARIES_TRUE@ socket-test queue-test proxy-test \
|
|
@ENABLE_LIBRARIES_TRUE@ signal-test newsignal-test \
|
|
@ENABLE_LIBRARIES_TRUE@ resources-test message-test \
|
|
@@ -1271,8 +1261,6 @@
|
|
@ENABLE_CPP_TEST_TRUE@@ENABLE_LIBRARIES_TRUE@cpp_compile_test_SOURCES = tests/cpp-compile-test.cpp
|
|
@ENABLE_LIBRARIES_TRUE@fixed_benchmark_SOURCES = tests/fixed-benchmark.c
|
|
@ENABLE_LIBRARIES_TRUE@fixed_benchmark_LDADD = $(RT_LIBS)
|
|
-@ENABLE_LIBRARIES_TRUE@os_wrappers_test_SOURCES = tests/os-wrappers-test.c
|
|
-@ENABLE_LIBRARIES_TRUE@os_wrappers_test_LDADD = libtest-runner.la
|
|
@ENABLE_LIBRARIES_TRUE@exec_fd_leak_checker_SOURCES = tests/exec-fd-leak-checker.c
|
|
@ENABLE_LIBRARIES_TRUE@exec_fd_leak_checker_LDADD = libtest-helpers.la
|
|
all: $(BUILT_SOURCES) config.h
|
|
@@ -1652,14 +1640,6 @@
|
|
newsignal-test$(EXEEXT): $(newsignal_test_OBJECTS) $(newsignal_test_DEPENDENCIES) $(EXTRA_newsignal_test_DEPENDENCIES)
|
|
@rm -f newsignal-test$(EXEEXT)
|
|
$(AM_V_CCLD)$(LINK) $(newsignal_test_OBJECTS) $(newsignal_test_LDADD) $(LIBS)
|
|
-tests/os-wrappers-test.$(OBJEXT): tests/$(am__dirstamp) \
|
|
- tests/$(DEPDIR)/$(am__dirstamp)
|
|
-
|
|
-os-wrappers-test$(EXEEXT): $(os_wrappers_test_OBJECTS) $(os_wrappers_test_DEPENDENCIES) $(EXTRA_os_wrappers_test_DEPENDENCIES)
|
|
- @rm -f os-wrappers-test$(EXEEXT)
|
|
- $(AM_V_CCLD)$(LINK) $(os_wrappers_test_OBJECTS) $(os_wrappers_test_LDADD) $(LIBS)
|
|
-tests/protocol-logger-test.$(OBJEXT): tests/$(am__dirstamp) \
|
|
- tests/$(DEPDIR)/$(am__dirstamp)
|
|
|
|
protocol-logger-test$(EXEEXT): $(protocol_logger_test_OBJECTS) $(protocol_logger_test_DEPENDENCIES) $(EXTRA_protocol_logger_test_DEPENDENCIES)
|
|
@rm -f protocol-logger-test$(EXEEXT)
|
|
@@ -1767,7 +1747,6 @@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/map-test.Po@am__quote@ # am--include-marker
|
|
@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/message-test.Po@am__quote@ # am--include-marker
|
|
@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/newsignal-test.Po@am__quote@ # am--include-marker
|
|
-@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/os-wrappers-test.Po@am__quote@ # am--include-marker
|
|
@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/protocol-logger-test.Po@am__quote@ # am--include-marker
|
|
@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/proxy-test.Po@am__quote@ # am--include-marker
|
|
@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/queue-test.Po@am__quote@ # am--include-marker
|
|
@@ -2426,13 +2405,6 @@
|
|
--log-file $$b.log --trs-file $$b.trs \
|
|
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
|
|
"$$tst" $(AM_TESTS_FD_REDIRECT)
|
|
-os-wrappers-test.log: os-wrappers-test$(EXEEXT)
|
|
- @p='os-wrappers-test$(EXEEXT)'; \
|
|
- b='os-wrappers-test'; \
|
|
- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
|
|
- --log-file $$b.log --trs-file $$b.trs \
|
|
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
|
|
- "$$tst" $(AM_TESTS_FD_REDIRECT)
|
|
sanity-test.log: sanity-test$(EXEEXT)
|
|
@p='sanity-test$(EXEEXT)'; \
|
|
b='sanity-test'; \
|
|
@@ -2849,7 +2821,6 @@
|
|
-rm -f tests/$(DEPDIR)/map-test.Po
|
|
-rm -f tests/$(DEPDIR)/message-test.Po
|
|
-rm -f tests/$(DEPDIR)/newsignal-test.Po
|
|
- -rm -f tests/$(DEPDIR)/os-wrappers-test.Po
|
|
-rm -f tests/$(DEPDIR)/protocol-logger-test.Po
|
|
-rm -f tests/$(DEPDIR)/proxy-test.Po
|
|
-rm -f tests/$(DEPDIR)/queue-test.Po
|
|
@@ -2945,7 +2916,6 @@
|
|
-rm -f tests/$(DEPDIR)/map-test.Po
|
|
-rm -f tests/$(DEPDIR)/message-test.Po
|
|
-rm -f tests/$(DEPDIR)/newsignal-test.Po
|
|
- -rm -f tests/$(DEPDIR)/os-wrappers-test.Po
|
|
-rm -f tests/$(DEPDIR)/protocol-logger-test.Po
|
|
-rm -f tests/$(DEPDIR)/proxy-test.Po
|
|
-rm -f tests/$(DEPDIR)/queue-test.Po
|