<p>osmith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-hlr/+/17071">View Change</a></p><div style="white-space:pre-wrap">Approvals:
fixeria: Looks good to me, approved; Verified
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mslookup_client_mdns_test: disable by default<br><br>Only build and run the test, if --enable-mslookup-client-mdns-test is<br>passed to ./configure. Enable that option in jenkins.sh.<br><br>Related: OS#4385<br>Change-Id: Ie0cd4b0c55a1fbb00c215aeec7dcd0c15805add3<br>---<br>M configure.ac<br>M contrib/jenkins.sh<br>M tests/mslookup/Makefile.am<br>M tests/testsuite.at<br>4 files changed, 29 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configure.ac b/configure.ac</span><br><span>index 59261e8..34c5163 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -107,6 +107,15 @@</span><br><span> AC_MSG_RESULT([$enable_ext_tests])</span><br><span> AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes")</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# mslookup_client_mdns_test (OS#4385: does not work everywhere)</span><br><span style="color: hsl(120, 100%, 40%);">+AC_ARG_ENABLE([mslookup_client_mdns_test],</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_HELP_STRING([--enable-mslookup-client-mdns-test],</span><br><span style="color: hsl(120, 100%, 40%);">+ [Include the mslookup_client_mdns_test in make check [default=no]]),</span><br><span style="color: hsl(120, 100%, 40%);">+ [enable_mslookup_client_mdns_test="$enableval"],[enable_mslookup_client_mdns_test="no"])</span><br><span style="color: hsl(120, 100%, 40%);">+AC_MSG_CHECKING([whether to enable mslookup_client_mdns_test])</span><br><span style="color: hsl(120, 100%, 40%);">+AC_MSG_RESULT([$enable_mslookup_client_mdns_test])</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CONDITIONAL(ENABLE_MSLOOKUP_CLIENT_MDNS_TEST, test "x$enable_mslookup_client_mdns_test" = "xyes")</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # Generate manuals</span><br><span> AC_ARG_ENABLE(manuals,</span><br><span> [AS_HELP_STRING(</span><br><span>diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh</span><br><span>index 5914182..522d72e 100755</span><br><span>--- a/contrib/jenkins.sh</span><br><span>+++ b/contrib/jenkins.sh</span><br><span>@@ -49,7 +49,12 @@</span><br><span> </span><br><span> cd "$base"</span><br><span> autoreconf --install --force</span><br><span style="color: hsl(0, 100%, 40%);">-./configure --enable-sanitize --enable-external-tests --enable-werror $CONFIG</span><br><span style="color: hsl(120, 100%, 40%);">+./configure \</span><br><span style="color: hsl(120, 100%, 40%);">+ --enable-sanitize \</span><br><span style="color: hsl(120, 100%, 40%);">+ --enable-external-tests \</span><br><span style="color: hsl(120, 100%, 40%);">+ --enable-mslookup-client-mdns-test \</span><br><span style="color: hsl(120, 100%, 40%);">+ --enable-werror \</span><br><span style="color: hsl(120, 100%, 40%);">+ $CONFIG</span><br><span> $MAKE $PARALLEL_MAKE</span><br><span> $MAKE check || cat-testlogs.sh</span><br><span> DISTCHECK_CONFIGURE_FLAGS="$CONFIG" $MAKE distcheck || cat-testlogs.sh</span><br><span>diff --git a/tests/mslookup/Makefile.am b/tests/mslookup/Makefile.am</span><br><span>index ebf2add..04778e8 100644</span><br><span>--- a/tests/mslookup/Makefile.am</span><br><span>+++ b/tests/mslookup/Makefile.am</span><br><span>@@ -24,7 +24,6 @@</span><br><span> </span><br><span> check_PROGRAMS = \</span><br><span> mdns_test \</span><br><span style="color: hsl(0, 100%, 40%);">- mslookup_client_mdns_test \</span><br><span> mslookup_client_test \</span><br><span> mslookup_test \</span><br><span> $(NULL)</span><br><span>@@ -45,14 +44,6 @@</span><br><span> $(LIBOSMOGSM_LIBS) \</span><br><span> $(NULL)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-mslookup_client_mdns_test_SOURCES = \</span><br><span style="color: hsl(0, 100%, 40%);">- mslookup_client_mdns_test.c \</span><br><span style="color: hsl(0, 100%, 40%);">- $(NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-mslookup_client_mdns_test_LDADD = \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/mslookup/libosmo-mslookup.la \</span><br><span style="color: hsl(0, 100%, 40%);">- $(LIBOSMOGSM_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> mdns_test_SOURCES = \</span><br><span> mdns_test.c \</span><br><span> $(NULL)</span><br><span>@@ -61,6 +52,18 @@</span><br><span> $(LIBOSMOGSM_LIBS) \</span><br><span> $(NULL)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+if ENABLE_MSLOOKUP_CLIENT_MDNS_TEST</span><br><span style="color: hsl(120, 100%, 40%);">+check_PROGRAMS += mslookup_client_mdns_test</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+mslookup_client_mdns_test_SOURCES = \</span><br><span style="color: hsl(120, 100%, 40%);">+ mslookup_client_mdns_test.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+mslookup_client_mdns_test_LDADD = \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/mslookup/libosmo-mslookup.la \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOGSM_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> .PHONY: update_exp</span><br><span> update_exp:</span><br><span> for i in $(check_PROGRAMS); do \</span><br><span>diff --git a/tests/testsuite.at b/tests/testsuite.at</span><br><span>index 827e9f8..d30b5e9 100644</span><br><span>--- a/tests/testsuite.at</span><br><span>+++ b/tests/testsuite.at</span><br><span>@@ -58,7 +58,9 @@</span><br><span> AT_CHECK([$abs_top_builddir/tests/mslookup/mslookup_client_test], [0], [ignore], [experr])</span><br><span> AT_CLEANUP</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# AT_SKIP_IF: disable without --enable-mslookup-client-mdns-test (OS#4385)</span><br><span> AT_SETUP([mslookup_client_mdns])</span><br><span style="color: hsl(120, 100%, 40%);">+AT_SKIP_IF([! test -e $abs_top_builddir/tests/mslookup/mslookup_client_mdns_test ])</span><br><span> AT_KEYWORDS([mslookup_client_mdns])</span><br><span> cat $abs_srcdir/mslookup/mslookup_client_mdns_test.err > experr</span><br><span> AT_CHECK([$abs_top_builddir/tests/mslookup/mslookup_client_mdns_test], [0], [ignore], [experr])</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-hlr/+/17071">change 17071</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/c/osmo-hlr/+/17071"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-hlr </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ie0cd4b0c55a1fbb00c215aeec7dcd0c15805add3 </div>
<div style="display:none"> Gerrit-Change-Number: 17071 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>