cellular-infrastructure
/
osmo-msc
mirror of https://gerrit.osmocom.org/osmo-msc
9
0
Fork 0
Code Issues Releases Wiki Activity

SGSN: Fixing build config 

Tests for V.42bis, slhc, llc-xid and sndcp-xid are built and
executed on all build configurations, but are only needed when
the sgsn (gprs) is built. This patch adds conditions check
if the tests mentioned abvove are needed or not.

Change-Id: I6921e6198ea7f99fe5276f91cbc522091853bc4e
This commit is contained in:
Philipp Maier 2016-09-28 11:33:54 +02:00 committed by Harald Welte
parent 0867b72055
commit ea291e3004
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openbsc/tests/Makefile.am
View File

@ -9,10 +9,6 @@ SUBDIRS = \
trau \ trau \
subscr \ subscr \
mm_auth \ mm_auth \
xid \
sndcp_xid \
slhc \
v42bis \
$(NULL) $(NULL)
if BUILD_NAT if BUILD_NAT
@ -40,6 +36,10 @@ if HAVE_LIBCARES
SUBDIRS += \ SUBDIRS += \
sgsn \ sgsn \
oap \ oap \
xid \
sndcp_xid \
slhc \
v42bis \
$(NULL) $(NULL)
endif endif
endif endif

4
openbsc/tests/testsuite.at
View File

@ -126,24 +126,28 @@ AT_CLEANUP
AT_SETUP([xid]) AT_SETUP([xid])
AT_KEYWORDS([xid]) AT_KEYWORDS([xid])
AT_CHECK([test "$enable_sgsn_test" != no || exit 77])
cat $abs_srcdir/xid/xid_test.ok > expout cat $abs_srcdir/xid/xid_test.ok > expout
AT_CHECK([$abs_top_builddir/tests/xid/xid_test], [], [expout], [ignore]) AT_CHECK([$abs_top_builddir/tests/xid/xid_test], [], [expout], [ignore])
AT_CLEANUP AT_CLEANUP
AT_SETUP([sndcp_xid]) AT_SETUP([sndcp_xid])
AT_KEYWORDS([sndcp_xid]) AT_KEYWORDS([sndcp_xid])
AT_CHECK([test "$enable_sgsn_test" != no || exit 77])
cat $abs_srcdir/sndcp_xid/sndcp_xid_test.ok > expout cat $abs_srcdir/sndcp_xid/sndcp_xid_test.ok > expout
AT_CHECK([$abs_top_builddir/tests/sndcp_xid/sndcp_xid_test], [], [expout], [ignore]) AT_CHECK([$abs_top_builddir/tests/sndcp_xid/sndcp_xid_test], [], [expout], [ignore])
AT_CLEANUP AT_CLEANUP
AT_SETUP([slhc]) AT_SETUP([slhc])
AT_KEYWORDS([slhc]) AT_KEYWORDS([slhc])
AT_CHECK([test "$enable_sgsn_test" != no || exit 77])
cat $abs_srcdir/slhc/slhc_test.ok > expout cat $abs_srcdir/slhc/slhc_test.ok > expout
AT_CHECK([$abs_top_builddir/tests/slhc/slhc_test], [], [expout], [ignore]) AT_CHECK([$abs_top_builddir/tests/slhc/slhc_test], [], [expout], [ignore])
AT_CLEANUP AT_CLEANUP
AT_SETUP([v42bis]) AT_SETUP([v42bis])
AT_KEYWORDS([v42bis]) AT_KEYWORDS([v42bis])
AT_CHECK([test "$enable_sgsn_test" != no || exit 77])
cat $abs_srcdir/v42bis/v42bis_test.ok > expout cat $abs_srcdir/v42bis/v42bis_test.ok > expout
AT_CHECK([$abs_top_builddir/tests/v42bis/v42bis_test], [], [expout], [ignore]) AT_CHECK([$abs_top_builddir/tests/v42bis/v42bis_test], [], [expout], [ignore])
AT_CLEANUP AT_CLEANUP