falconia has uploaded this change for review.

View Change

tests: fix for --disable-ortp

osmo_ortp part of libosmotrau is now optional, can be disabled
for systems on which libortp dependency is too onerous.  Fix the
testsuite so it can run when built with --disable-ortp.

Related: OS#6474
Change-Id: I3c59cfab78f58935a5ab6ce7b5f0ed8aadd853a8
---
M tests/Makefile.am
M tests/testsuite.at
2 files changed, 5 insertions(+), 1 deletion(-)

git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/37/38137/1

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 580c38b..a01f381 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -7,10 +7,13 @@
 		  ipa_proxy_test	\
 		  subchan_demux/subchan_demux_test \
 		  ipa_recv/ipa_recv_test \
-		  rtp_test/rtp_test \
 		  trau_sync/trau_sync_test \
 		  trau_pcu_ericsson/trau_pcu_ericsson_test
 
+if ENABLE_ORTP
+check_PROGRAMS += rtp_test/rtp_test
+endif
+
 e1inp_ipa_bsc_test_SOURCES = e1inp_ipa_bsc_test.c
 e1inp_ipa_bsc_test_LDADD = $(top_builddir)/src/libosmoabis.la \
 			$(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 4dfb793..818e4fa 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -25,6 +25,7 @@
 
 AT_SETUP([rtp_test])
 AT_KEYWORDS([rtp_test])
+AT_SKIP_IF([test "x$ENABLE_ORTP" != "xyes"])
 cat $abs_srcdir/rtp_test/rtp_test.ok > expout
 AT_CHECK([$abs_top_builddir/tests/rtp_test/rtp_test], [ignore], [expout])
 AT_CLEANUP

To view, visit change 38137. To unsubscribe, or for help writing mail filters, visit settings.