From f0e90e6bd5e5b2be17253e357a0521da42dc43aa Mon Sep 17 00:00:00 2001
From: Oliver Smith <osmith@sysmocom.de>
Date: Thu, 30 Jan 2020 09:55:00 +0100
Subject: mslookup_client_mdns_test: disable by default

Only build and run the test, if --enable-mslookup-client-mdns-test is
passed to ./configure. Enable that option in jenkins.sh.

Related: OS#4385
Change-Id: Ie0cd4b0c55a1fbb00c215aeec7dcd0c15805add3
---
 tests/mslookup/Makefile.am | 17 ++++++++++-------
 tests/testsuite.at         |  2 ++
 2 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'tests')

diff --git a/tests/mslookup/Makefile.am b/tests/mslookup/Makefile.am
index ebf2add..04778e8 100644
--- a/tests/mslookup/Makefile.am
+++ b/tests/mslookup/Makefile.am
@@ -24,7 +24,6 @@ EXTRA_DIST = \
 
 check_PROGRAMS = \
 	mdns_test \
-	mslookup_client_mdns_test \
 	mslookup_client_test \
 	mslookup_test \
 	$(NULL)
@@ -45,21 +44,25 @@ mslookup_client_test_LDADD = \
 	$(LIBOSMOGSM_LIBS) \
 	$(NULL)
 
-mslookup_client_mdns_test_SOURCES = \
-	mslookup_client_mdns_test.c \
+mdns_test_SOURCES = \
+	mdns_test.c \
 	$(NULL)
-mslookup_client_mdns_test_LDADD = \
+mdns_test_LDADD = \
 	$(top_builddir)/src/mslookup/libosmo-mslookup.la \
 	$(LIBOSMOGSM_LIBS) \
 	$(NULL)
 
-mdns_test_SOURCES = \
-	mdns_test.c \
+if ENABLE_MSLOOKUP_CLIENT_MDNS_TEST
+check_PROGRAMS += mslookup_client_mdns_test
+
+mslookup_client_mdns_test_SOURCES = \
+	mslookup_client_mdns_test.c \
 	$(NULL)
-mdns_test_LDADD = \
+mslookup_client_mdns_test_LDADD = \
 	$(top_builddir)/src/mslookup/libosmo-mslookup.la \
 	$(LIBOSMOGSM_LIBS) \
 	$(NULL)
+endif
 
 .PHONY: update_exp
 update_exp:
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 827e9f8..d30b5e9 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -58,7 +58,9 @@ cat $abs_srcdir/mslookup/mslookup_client_test.err > experr
 AT_CHECK([$abs_top_builddir/tests/mslookup/mslookup_client_test], [0], [ignore], [experr])
 AT_CLEANUP
 
+# AT_SKIP_IF: disable without --enable-mslookup-client-mdns-test (OS#4385)
 AT_SETUP([mslookup_client_mdns])
+AT_SKIP_IF([! test -e $abs_top_builddir/tests/mslookup/mslookup_client_mdns_test ])
 AT_KEYWORDS([mslookup_client_mdns])
 cat $abs_srcdir/mslookup/mslookup_client_mdns_test.err > experr
 AT_CHECK([$abs_top_builddir/tests/mslookup/mslookup_client_mdns_test], [0], [ignore], [experr])
-- 
cgit v1.2.3