diff options
author | Oliver Smith <osmith@sysmocom.de> | 2020-01-30 09:55:00 +0100 |
---|---|---|
committer | osmith <osmith@sysmocom.de> | 2020-02-14 11:16:47 +0000 |
commit | f0e90e6bd5e5b2be17253e357a0521da42dc43aa (patch) | |
tree | 484363aa6c6a0bbe7f3b43f421cf02cbb1279b27 | |
parent | 15ad7bef5ff62965e208d9f6bb9830450085c25f (diff) |
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
-rw-r--r-- | configure.ac | 9 | ||||
-rwxr-xr-x | contrib/jenkins.sh | 7 | ||||
-rw-r--r-- | tests/mslookup/Makefile.am | 17 | ||||
-rw-r--r-- | tests/testsuite.at | 2 |
4 files changed, 27 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 59261e8..34c5163 100644 --- a/configure.ac +++ b/configure.ac @@ -107,6 +107,15 @@ AC_MSG_CHECKING([whether to enable VTY/CTRL tests]) AC_MSG_RESULT([$enable_ext_tests]) AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes") +# mslookup_client_mdns_test (OS#4385: does not work everywhere) +AC_ARG_ENABLE([mslookup_client_mdns_test], + AC_HELP_STRING([--enable-mslookup-client-mdns-test], + [Include the mslookup_client_mdns_test in make check [default=no]]), + [enable_mslookup_client_mdns_test="$enableval"],[enable_mslookup_client_mdns_test="no"]) +AC_MSG_CHECKING([whether to enable mslookup_client_mdns_test]) +AC_MSG_RESULT([$enable_mslookup_client_mdns_test]) +AM_CONDITIONAL(ENABLE_MSLOOKUP_CLIENT_MDNS_TEST, test "x$enable_mslookup_client_mdns_test" = "xyes") + # Generate manuals AC_ARG_ENABLE(manuals, [AS_HELP_STRING( diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 5914182..522d72e 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -49,7 +49,12 @@ set -x cd "$base" autoreconf --install --force -./configure --enable-sanitize --enable-external-tests --enable-werror $CONFIG +./configure \ + --enable-sanitize \ + --enable-external-tests \ + --enable-mslookup-client-mdns-test \ + --enable-werror \ + $CONFIG $MAKE $PARALLEL_MAKE $MAKE check || cat-testlogs.sh DISTCHECK_CONFIGURE_FLAGS="$CONFIG" $MAKE distcheck || cat-testlogs.sh 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]) |