From ea291e3004182257399a53f95b236e57d1adf989 Mon Sep 17 00:00:00 2001
From: Philipp <pmaier@sysmocom.de>
Date: Wed, 28 Sep 2016 11:33:54 +0200
Subject: 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
---
 openbsc/tests/Makefile.am  | 8 ++++----
 openbsc/tests/testsuite.at | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/openbsc/tests/Makefile.am b/openbsc/tests/Makefile.am
index 0ebd2e2bb..468edd254 100644
--- a/openbsc/tests/Makefile.am
+++ b/openbsc/tests/Makefile.am
@@ -9,10 +9,6 @@ SUBDIRS = \
 	trau \
 	subscr \
 	mm_auth \
-	xid \
-	sndcp_xid \
-	slhc \
-	v42bis \
 	$(NULL)
 
 if BUILD_NAT
@@ -40,6 +36,10 @@ if HAVE_LIBCARES
 SUBDIRS += \
 	sgsn \
 	oap \
+	xid \
+	sndcp_xid \
+	slhc \
+	v42bis \
 	$(NULL)
 endif
 endif
diff --git a/openbsc/tests/testsuite.at b/openbsc/tests/testsuite.at
index f18b73400..4905cd148 100644
--- a/openbsc/tests/testsuite.at
+++ b/openbsc/tests/testsuite.at
@@ -126,24 +126,28 @@ AT_CLEANUP
 
 AT_SETUP([xid])
 AT_KEYWORDS([xid])
+AT_CHECK([test "$enable_sgsn_test" != no || exit 77])
 cat $abs_srcdir/xid/xid_test.ok > expout
 AT_CHECK([$abs_top_builddir/tests/xid/xid_test], [], [expout], [ignore])
 AT_CLEANUP
 
 AT_SETUP([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
 AT_CHECK([$abs_top_builddir/tests/sndcp_xid/sndcp_xid_test], [], [expout], [ignore])
 AT_CLEANUP
 
 AT_SETUP([slhc])
 AT_KEYWORDS([slhc])
+AT_CHECK([test "$enable_sgsn_test" != no || exit 77])
 cat $abs_srcdir/slhc/slhc_test.ok > expout
 AT_CHECK([$abs_top_builddir/tests/slhc/slhc_test], [], [expout], [ignore])
 AT_CLEANUP
 
 AT_SETUP([v42bis])
 AT_KEYWORDS([v42bis])
+AT_CHECK([test "$enable_sgsn_test" != no || exit 77])
 cat $abs_srcdir/v42bis/v42bis_test.ok > expout
 AT_CHECK([$abs_top_builddir/tests/v42bis/v42bis_test], [], [expout], [ignore])
 AT_CLEANUP
-- 
cgit v1.2.3