diff options
Diffstat (limited to 'tests/channel')
| -rw-r--r-- | tests/channel/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/channel/Makefile.in | 9 | ||||
| -rw-r--r-- | tests/channel/channel_test.c | 6 |
3 files changed, 11 insertions, 8 deletions
diff --git a/tests/channel/Makefile.am b/tests/channel/Makefile.am index bf709ff28..df98f6811 100644 --- a/tests/channel/Makefile.am +++ b/tests/channel/Makefile.am @@ -1,10 +1,10 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) +AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) noinst_PROGRAMS = channel_test channel_test_SOURCES = channel_test.c -channel_test_LDADD = -ldl -ldbi $(LIBOSMOCORE_LIBS) \ +channel_test_LDADD = -ldl -ldbi $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \ $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libbsc/libbsc.a \ $(top_builddir)/src/libmsc/libmsc.a diff --git a/tests/channel/Makefile.in b/tests/channel/Makefile.in index de4b45e42..94f35c058 100644 --- a/tests/channel/Makefile.in +++ b/tests/channel/Makefile.in @@ -36,7 +36,7 @@ noinst_PROGRAMS = channel_test$(EXEEXT) subdir = tests/channel DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -48,6 +48,7 @@ am_channel_test_OBJECTS = channel_test.$(OBJEXT) channel_test_OBJECTS = $(am_channel_test_OBJECTS) am__DEPENDENCIES_1 = channel_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) \ $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libbsc/libbsc.a \ $(top_builddir)/src/libmsc/libmsc.a @@ -109,6 +110,8 @@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBOSMOCORE_CFLAGS = @LIBOSMOCORE_CFLAGS@ LIBOSMOCORE_LIBS = @LIBOSMOCORE_LIBS@ +LIBOSMOGSM_CFLAGS = @LIBOSMOGSM_CFLAGS@ +LIBOSMOGSM_LIBS = @LIBOSMOGSM_LIBS@ LIBOSMOSCCP_CFLAGS = @LIBOSMOSCCP_CFLAGS@ LIBOSMOSCCP_LIBS = @LIBOSMOSCCP_LIBS@ LIBOSMOVTY_CFLAGS = @LIBOSMOVTY_CFLAGS@ @@ -178,9 +181,9 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS = -Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) +AM_CFLAGS = -Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) channel_test_SOURCES = channel_test.c -channel_test_LDADD = -ldl -ldbi $(LIBOSMOCORE_LIBS) \ +channel_test_LDADD = -ldl -ldbi $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \ $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libbsc/libbsc.a \ $(top_builddir)/src/libmsc/libmsc.a diff --git a/tests/channel/channel_test.c b/tests/channel/channel_test.c index 4f3c59335..1121dd5ad 100644 --- a/tests/channel/channel_test.c +++ b/tests/channel/channel_test.c @@ -22,7 +22,7 @@ #include <assert.h> -#include <osmocore/select.h> +#include <osmocom/core/select.h> #include <openbsc/gsm_subscriber.h> #include <openbsc/abis_rsl.h> @@ -56,7 +56,7 @@ int main(int argc, char **argv) network = gsm_network_init(1, 1, NULL); if (!network) exit(1); - bts = gsm_bts_alloc(network, GSM_BTS_TYPE_BS11, 0, 0); + bts = gsm_bts_alloc(network); bts->location_area_code = 23; /* Create a dummy subscriber */ @@ -68,7 +68,7 @@ int main(int argc, char **argv) subscr_get_channel(subscr, RSL_CHANNEED_TCH_F, subscr_cb, (void*)0x2342L); while (1) { - bsc_select_main(0); + osmo_select_main(0); } } |