test/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d0db456dc3059be6f39a7b73ac60afb1cffc1299
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Wed Aug 14 09:05:23 2019 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Wed Aug 14 09:05:23 2019 +0200
test: avoid ODR violation in UnitCopyPaste
As far as I understand, it is not necessary to link symbols of the wsd
process into unit-copy-paste.so, since we link it with the -module
libtool flag and then load it using dlopen, see
<https://www.gnu.org/software/libtool/manual/html_node/Building-modules.html#Building-modules>.
It seems this is the only test that links ${test_base_source}.
This fixes the following ODR violation:
==18174==ERROR: AddressSanitizer: odr-violation (0x000002090b20):
[1] size=40 'SigHandlerTrap' ../common/SigUtil.cpp:76:12
[2] size=40 'SigHandlerTrap' common/SigUtil.cpp:76:12
These globals were registered at these points:
[1]:
#0 0x5f9a68 in __asan_register_globals.part.13
/home/vmiklos/git/libreoffice/lode/packages/llvm-472c6ef8b0f53061b049039f9775ab127beafbe4.src/compiler-rt/lib/asan/asan_globals.cc:365
#1 0x7f60335f1e4b in asan.module_ctor
(/home/vmiklos/git/libreoffice/online-san/test/../test/.libs/unit-copy-paste.so+0x60ae4b)
[2]:
#0 0x5f9a68 in __asan_register_globals.part.13
/home/vmiklos/git/libreoffice/lode/packages/llvm-472c6ef8b0f53061b049039f9775ab127beafbe4.src/compiler-rt/lib/asan/asan_globals.cc:365
#1 0xe2bd5e in asan.module_ctor
(/home/vmiklos/git/libreoffice/online-san/loolwsd+0xe2bd5e)
Change-Id: Ic990a1885777e198e59cbc85156c7e5231bac524
diff --git a/test/Makefile.am b/test/Makefile.am
index bb778f5a4..27fc43e99 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -94,7 +94,7 @@ unit_client_la_SOURCES = UnitClient.cpp ${test_all_source}
unit_client_la_LIBADD = $(CPPUNIT_LIBS)
unit_typing_la_SOURCES = UnitTyping.cpp
unit_typing_la_LIBADD = $(CPPUNIT_LIBS)
-unit_copy_paste_la_SOURCES = UnitCopyPaste.cpp ${test_base_source}
+unit_copy_paste_la_SOURCES = UnitCopyPaste.cpp
unit_copy_paste_la_LIBADD = $(CPPUNIT_LIBS)
unit_convert_la_SOURCES = UnitConvert.cpp
unit_timeout_la_SOURCES = UnitTimeout.cpp
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
