So far I got these errors before patching:
libtool: link: cc -o .libs/headers-test -pthread -Wall -Wextra
-Wno-unused-parameter -g -Wstrict-prototypes -Wmissing-prototypes
-fvisibility=hidden -O2 -pipe tests/headers-test.o
tests/headers-protocol-test.o tests/headers-protocol-core-test.o
/tmp/obj/wayland-1.16.0/build-amd64/.libs/libtest-runner.a -L.libs
-lwayland-client -lffi -lm -lwayland-server -lkvm -Wl,-rpath-link,/usr/local/lib
ld: error: duplicate symbol: main
>>> defined at headers-test.c:53
>>> (/tmp/obj/wayland-1.16.0/wayland-1.16.0/tests/headers-test.c:53)
>>> tests/headers-test.o:(main)
>>> defined at test-runner.c:377
>>> (/tmp/obj/wayland-1.16.0/wayland-1.16.0/tests/test-runner.c:377)
>>> test-runner.o:(.text+0x250) in archive
>>> /tmp/obj/wayland-1.16.0/build-amd64/.libs/libtest-runner.a
libtool: link: cc -o .libs/exec-fd-leak-checker -pthread -Wall -Wextra
-Wno-unused-parameter -g -Wstrict-prototypes -Wmissing-prototypes
-fvisibility=hidden -O2 -pipe tests/exec-fd-leak-checker.o
/tmp/obj/wayland-1.16.0/build-amd64/.libs/libtest-runner.a -L.libs
-lwayland-client -lffi -lm -lwayland-server -lkvm -Wl,-rpath-link,/usr/local/lib
ld: error: duplicate symbol: main
>>> defined at exec-fd-leak-checker.c:57
>>> (/tmp/obj/wayland-1.16.0/wayland-1.16.0/tests/exec-fd-leak-checker.c:57)
>>> tests/exec-fd-leak-checker.o:(main)
>>> defined at test-runner.c:377
>>> (/tmp/obj/wayland-1.16.0/wayland-1.16.0/tests/test-runner.c:377)
>>> test-runner.o:(.text+0x250) in archive
>>> /tmp/obj/wayland-1.16.0/build-amd64/.libs/libtest-runner.a
Makefile.am: error: object 'tests/test-helpers.$(OBJEXT)' created both with
libtool and without
libtool: link: cc -o .libs/fixed-benchmark -pthread -Wall -Wextra
-Wno-unused-parameter -g -Wstrict-prototypes -Wmissing-prototypes
-fvisibility=hidden -O2 -pipe tests/fixed-benchmark.o
/tmp/obj/wayland-1.16.0/build-amd64/.libs/libtest-runner.a -L.libs
-lwayland-client -lffi -lm -lwayland-server -lkvm -Wl,-rpath-link,/usr/local/lib
ld: error: duplicate symbol: main
>>> defined at fixed-benchmark.c:100
>>> (/tmp/obj/wayland-1.16.0/wayland-1.16.0/tests/fixed-benchmark.c:100)
>>> tests/fixed-benchmark.o:(main)
>>> defined at test-runner.c:377
>>> (/tmp/obj/wayland-1.16.0/wayland-1.16.0/tests/test-runner.c:377)
>>> test-runner.o:(.text+0x250) in archive
>>> /tmp/obj/wayland-1.16.0/build-amd64/.libs/libtest-runner.a
This commit fixes all of that.
Signed-off-by: Leonid Bobrov <mazoc...@disroot.org>
---
Makefile.am | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 697c517..f47d055 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -210,12 +210,15 @@ noinst_PROGRAMS = \
exec-fd-leak-checker \
fixed-benchmark
-noinst_LTLIBRARIES += libtest-runner.la
+noinst_LTLIBRARIES += \
+ libtest-runner.la \
+ libtest-helpers.la
+
+libtest_helpers_la_SOURCES = tests/test-helpers.c
libtest_runner_la_SOURCES = \
tests/test-runner.c \
tests/test-runner.h \
- tests/test-helpers.c \
tests/test-compositor.h \
tests/test-compositor.c
libtest_runner_la_LIBADD = \
@@ -223,9 +226,9 @@ libtest_runner_la_LIBADD = \
libwayland-util.la \
libwayland-client.la \
libwayland-server.la \
+ libtest-helpers.la \
-lrt -ldl $(FFI_LIBS)
-
array_test_SOURCES = tests/array-test.c
array_test_LDADD = libtest-runner.la
client_test_SOURCES = tests/client-test.c
@@ -270,7 +273,6 @@ protocol_logger_test_LDADD = libtest-runner.la
headers_test_SOURCES = tests/headers-test.c \
tests/headers-protocol-test.c \
tests/headers-protocol-core-test.c
-headers_test_LDADD = libtest-runner.la
nodist_headers_test_SOURCES = \
protocol/wayland-server-protocol-core.h \
protocol/wayland-client-protocol-core.h
@@ -280,13 +282,12 @@ cpp_compile_test_SOURCES = tests/cpp-compile-test.cpp
endif
fixed_benchmark_SOURCES = tests/fixed-benchmark.c
-fixed_benchmark_LDADD = libtest-runner.la
os_wrappers_test_SOURCES = tests/os-wrappers-test.c
os_wrappers_test_LDADD = libtest-runner.la
exec_fd_leak_checker_SOURCES = tests/exec-fd-leak-checker.c
-exec_fd_leak_checker_LDADD = libtest-runner.la
+exec_fd_leak_checker_LDADD = libtest-helpers.la
EXTRA_DIST += tests/scanner-test.sh \
protocol/tests.xml \
--
2.20.1
_______________________________________________
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/wayland-devel
