<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/5844">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fix tests linking: don't use system installed libs<br><br>Do not link against the system-wide installed libosmo* libs when building the<br>regression test programs. Always use the locally built ones.<br><br>Linking some libosmo libraries causes libtool to pull in other libosmo libs<br>even though they were not explicitly named. For example, ctrl_test explicitly<br>links libosmoctrl, but this also has dependencies to libosmovty and libosmogsm:<br><br> ldd src/ctrl/.libs/libosmoctrl.so | grep osmo<br> libosmocore.so.11 => /usr/local/lib/libosmocore.so.11 (0x00007f26c26d4000)<br> libosmogsm.so.10 => /usr/local/lib/libosmogsm.so.10 (0x00007f26c22bb000)<br> libosmovty.so.4 => /usr/local/lib/libosmovty.so.4 (0x00007f26c2171000)<br><br>If we omit explicit LDADD of these dependencies in the Makefile.am, libtool<br>will take the first canonical place to find them, which may just be the already<br>installed older versions of the same libs, which may or may not be compatible<br>with the current build. In any case, it is never intended to link installed<br>libs.<br><br>All library dependencies are listed by this quick script:<br><br> cd libosmocore<br> for l in $(find . -name "*.so") ; do echo; echo "$l"; ldd $l | grep libosmo; done<br><br> ./.libs/libosmocore.so<br><br> ./coding/.libs/libosmocoding.so<br> libosmocore.so.11 => /usr/local/lib/libosmocore.so.11 (0x00007f25fc3c2000)<br> libosmogsm.so.10 => /usr/local/lib/libosmogsm.so.10 (0x00007f25fbfa9000)<br> libosmocodec.so.0 => /usr/local/lib/libosmocodec.so.0 (0x00007f25fbf9b000)<br><br> ./codec/.libs/libosmocodec.so<br> libosmocore.so.11 => /usr/local/lib/libosmocore.so.11 (0x00007fb4c900d000)<br><br> ./ctrl/.libs/libosmoctrl.so<br> libosmocore.so.11 => /usr/local/lib/libosmocore.so.11 (0x00007f5df5129000)<br> libosmogsm.so.10 => /usr/local/lib/libosmogsm.so.10 (0x00007f5df4d10000)<br> libosmovty.so.4 => /usr/local/lib/libosmovty.so.4 (0x00007f5df4bc6000)<br><br> ./gb/.libs/libosmogb.so<br> libosmocore.so.11 => /usr/local/lib/libosmocore.so.11 (0x00007f788e536000)<br> libosmovty.so.4 => /usr/local/lib/libosmovty.so.4 (0x00007f788e3ec000)<br> libosmogsm.so.10 => /usr/local/lib/libosmogsm.so.10 (0x00007f788dfd3000)<br><br> ./vty/.libs/libosmovty.so<br> libosmocore.so.11 => /usr/local/lib/libosmocore.so.11 (0x00007f3b7ed21000)<br><br> ./gsm/.libs/libosmogsm.so<br> libosmocore.so.11 => /usr/local/lib/libosmocore.so.11 (0x00007fc69472e000)<br><br> ./sim/.libs/libosmosim.so<br> libosmocore.so.11 => /usr/local/lib/libosmocore.so.11 (0x00007f2f6412d000)<br> libosmogsm.so.10 => /usr/local/lib/libosmogsm.so.10 (0x00007f2f63d14000)<br><br>Add all explicit linking of all required library dependencies in all regression<br>test programs, as shown by above listing.<br><br>Example for reproducing a problem:<br><br>In libosmocore.a, introduce a new function, and call that from libosmovty code.<br>For example, I made loglevel_strs non-static in logging.c, and used that in<br>logging_vty.c. Build and install this in a place where libtool can find it.<br>Then go back to before this change and rebuild. You will see that linking<br>ctrl_test (before this patch) then complains about libosmovty requiring the<br>loglevel_strs symbol which it cannot find in libosmocore.so.<br><br>Change-Id: Id084e6e6efd25cd62b1bd7a4fc7c5985c39130c6<br>---<br>M tests/Makefile.am<br>1 file changed, 13 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/Makefile.am b/tests/Makefile.am</span><br><span>index 072bb4a..5d07695 100644</span><br><span>--- a/tests/Makefile.am</span><br><span>+++ b/tests/Makefile.am</span><br><span>@@ -76,7 +76,10 @@</span><br><span> abis_abis_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la</span><br><span> </span><br><span> ctrl_ctrl_test_SOURCES = ctrl/ctrl_test.c</span><br><span style="color: hsl(0, 100%, 40%);">-ctrl_ctrl_test_LDADD = $(LDADD) $(top_builddir)/src/ctrl/libosmoctrl.la</span><br><span style="color: hsl(120, 100%, 40%);">+ctrl_ctrl_test_LDADD = $(LDADD) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/ctrl/libosmoctrl.la \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/gsm/libosmogsm.la \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/vty/libosmovty.la</span><br><span> </span><br><span> gea_gea_test_SOURCES = gea/gea_test.c</span><br><span> gea_gea_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la</span><br><span>@@ -130,20 +133,24 @@</span><br><span> </span><br><span> gb_bssgp_fc_test_SOURCES = gb/bssgp_fc_test.c</span><br><span> gb_bssgp_fc_test_LDADD = $(LDADD) $(top_builddir)/src/gb/libosmogb.la \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/vty/libosmovty.la \</span><br><span> $(top_builddir)/src/gsm/libosmogsm.la</span><br><span> </span><br><span> gb_gprs_bssgp_test_SOURCES = gb/gprs_bssgp_test.c</span><br><span> gb_gprs_bssgp_test_LDADD = $(LDADD) $(top_builddir)/src/gb/libosmogb.la $(LIBRARY_DLSYM) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/vty/libosmovty.la \</span><br><span> $(top_builddir)/src/gsm/libosmogsm.la</span><br><span> </span><br><span> gb_gprs_ns_test_SOURCES = gb/gprs_ns_test.c</span><br><span> gb_gprs_ns_test_LDADD = $(LDADD) $(top_builddir)/src/gb/libosmogb.la $(LIBRARY_DLSYM) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/vty/libosmovty.la \</span><br><span> $(top_builddir)/src/gsm/libosmogsm.la</span><br><span> </span><br><span> logging_logging_test_SOURCES = logging/logging_test.c</span><br><span> </span><br><span> fr_fr_test_SOURCES = fr/fr_test.c</span><br><span> fr_fr_test_LDADD = $(LDADD) $(top_builddir)/src/gb/libosmogb.la $(LIBRARY_DLSYM) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/vty/libosmovty.la \</span><br><span> $(top_builddir)/src/gsm/libosmogsm.la</span><br><span> </span><br><span> codec_codec_test_SOURCES = codec/codec_test.c</span><br><span>@@ -177,7 +184,11 @@</span><br><span> oap_oap_client_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la</span><br><span> </span><br><span> fsm_fsm_test_SOURCES = fsm/fsm_test.c</span><br><span style="color: hsl(0, 100%, 40%);">-fsm_fsm_test_LDADD = $(LDADD) $(top_builddir)/src/ctrl/libosmoctrl.la</span><br><span style="color: hsl(120, 100%, 40%);">+fsm_fsm_test_LDADD = \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LDADD) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/ctrl/libosmoctrl.la \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/gsm/libosmogsm.la \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/vty/libosmovty.la</span><br><span> </span><br><span> write_queue_wqueue_test_SOURCES = write_queue/wqueue_test.c</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/5844">change 5844</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/5844"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Id084e6e6efd25cd62b1bd7a4fc7c5985c39130c6 </div>
<div style="display:none"> Gerrit-Change-Number: 5844 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>