From 2583b62205f30ab23d3d567ea2f5da4dc3cba9e7 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Thu, 7 Jun 2018 02:50:18 +0200 Subject: tests: remove channel_test Rationale: channel_test is trivial and useless, probably only exists as a legacy from openbsc.git. - it tests two printf()s of "(bts=45,trx=0,ts=3,ss=4)", hardly useful. - it tests ts_subslots() behavior for dyn ts, which will soon be replaced by a most trivial mapping that does no longer need complex dyn ts state evaluation (when introducing the new timeslot FSM to handle dyn TS switchover). Change-Id: Ib2232da8e7fa964b92492d7b778320401dc97703 --- configure.ac | 1 - tests/Makefile.am | 1 - tests/channel/Makefile.am | 31 ----------- tests/channel/channel_test.c | 124 ------------------------------------------ tests/channel/channel_test.ok | 2 - tests/testsuite.at | 6 -- 6 files changed, 165 deletions(-) delete mode 100644 tests/channel/Makefile.am delete mode 100644 tests/channel/channel_test.c delete mode 100644 tests/channel/channel_test.ok diff --git a/configure.ac b/configure.ac index b0e17c5f1..62a7dd06d 100644 --- a/configure.ac +++ b/configure.ac @@ -176,7 +176,6 @@ AC_OUTPUT( tests/Makefile tests/atlocal tests/gsm0408/Makefile - tests/channel/Makefile tests/bsc/Makefile tests/abis/Makefile tests/subscr/Makefile diff --git a/tests/Makefile.am b/tests/Makefile.am index 7bbef9980..95d836b9b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,7 +1,6 @@ SUBDIRS = \ bsc \ gsm0408 \ - channel \ abis \ subscr \ nanobts_omlattr \ diff --git a/tests/channel/Makefile.am b/tests/channel/Makefile.am deleted file mode 100644 index f641f6026..000000000 --- a/tests/channel/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -AM_CPPFLAGS = \ - $(all_includes) \ - -I$(top_srcdir)/include \ - $(NULL) - -AM_CFLAGS = \ - -Wall \ - -ggdb3 \ - $(LIBOSMOCORE_CFLAGS) \ - $(LIBOSMOGSM_CFLAGS) \ - $(LIBOSMOABIS_CFLAGS) \ - $(NULL) - -EXTRA_DIST = \ - channel_test.ok \ - $(NULL) - -noinst_PROGRAMS = \ - channel_test \ - $(NULL) - -channel_test_SOURCES = \ - channel_test.c \ - $(NULL) - -channel_test_LDADD = \ - $(top_builddir)/src/libbsc/libbsc.a \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - $(LIBOSMOABIS_LIBS) \ - $(NULL) diff --git a/tests/channel/channel_test.c b/tests/channel/channel_test.c deleted file mode 100644 index e8f6cd921..000000000 --- a/tests/channel/channel_test.c +++ /dev/null @@ -1,124 +0,0 @@ -/* - * (C) 2009 by Holger Hans Peter Freyther - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -#include -#include - -#include - -#include -#include - -#include -#include -#include - -void test_bts_debug_print(void) -{ - struct gsm_network *network; - struct gsm_bts *bts; - struct gsm_bts_trx *trx; - - printf("Testing the lchan printing:"); - - /* Create a dummy network */ - network = bsc_network_init(tall_bsc_ctx); - if (!network) - exit(1); - /* Add a BTS with some reasonanbly non-zero id */ - bts = gsm_bts_alloc(network, 45); - /* Add a second TRX to test on multiple TRXs */ - gsm_bts_trx_alloc(bts); - - llist_for_each_entry(trx, &bts->trx_list, list) { - char *name = gsm_lchan_name(&trx->ts[3].lchan[4]); - - if (name) - printf(" %s", name); - else - printf("NULL name"); - } - printf("\n"); -} - - -void test_dyn_ts_subslots(void) -{ - struct gsm_bts_trx_ts ts; - - printf("Testing subslot numbers for pchan types\n"); - - ts.pchan = GSM_PCHAN_TCH_F; - OSMO_ASSERT(ts_subslots(&ts) == 1); - - ts.pchan = GSM_PCHAN_TCH_H; - OSMO_ASSERT(ts_subslots(&ts) == 2); - - ts.pchan = GSM_PCHAN_PDCH; - OSMO_ASSERT(ts_subslots(&ts) == 0); - - ts.pchan = GSM_PCHAN_TCH_F_PDCH; - ts.flags = 0; /* TCH_F mode */ - OSMO_ASSERT(ts_subslots(&ts) == 1); - ts.flags = TS_F_PDCH_ACTIVE; - OSMO_ASSERT(ts_subslots(&ts) == 0); - - ts.pchan = GSM_PCHAN_TCH_F_TCH_H_PDCH; - ts.dyn.pchan_is = GSM_PCHAN_TCH_F; - OSMO_ASSERT(ts_subslots(&ts) == 1); - ts.dyn.pchan_is = GSM_PCHAN_TCH_H; - OSMO_ASSERT(ts_subslots(&ts) == 2); - ts.dyn.pchan_is = GSM_PCHAN_PDCH; - OSMO_ASSERT(ts_subslots(&ts) == 0); -} - -static const struct log_info_cat log_categories[] = { -}; - -static const struct log_info log_info = { - .cat = log_categories, - .num_cat = ARRAY_SIZE(log_categories), -}; - -int main(int argc, char **argv) -{ - osmo_init_logging2(NULL, &log_info); - - test_dyn_ts_subslots(); - test_bts_debug_print(); - - return EXIT_SUCCESS; -} - -void sms_alloc() {} -void sms_free() {} -void gsm48_secure_channel() {} -void vty_out() {} - -void ipa_client_conn_clear_queue() {} -void ipa_client_conn_close() {} -void ipa_client_conn_create() {} -void ipa_client_conn_destroy() {} -void ipa_client_conn_open() {} -void ipa_client_conn_send() {} -void ipa_msg_push_header() {} -void ipaccess_bts_handle_ccm() {} -struct gsm_subscriber_connection *bsc_subscr_con_allocate(struct gsm_network *network) { return NULL; } - -struct tlv_definition nm_att_tlvdef; diff --git a/tests/channel/channel_test.ok b/tests/channel/channel_test.ok deleted file mode 100644 index 81d656927..000000000 --- a/tests/channel/channel_test.ok +++ /dev/null @@ -1,2 +0,0 @@ -Testing subslot numbers for pchan types -Testing the lchan printing: (bts=45,trx=0,ts=3,ss=4) (bts=45,trx=1,ts=3,ss=4) diff --git a/tests/testsuite.at b/tests/testsuite.at index 974af895d..515ffa0cb 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -14,12 +14,6 @@ cat $abs_srcdir/subscr/bsc_subscr_test.err > experr AT_CHECK([$abs_top_builddir/tests/subscr/bsc_subscr_test], [], [expout], [experr]) AT_CLEANUP -AT_SETUP([channel]) -AT_KEYWORDS([channel]) -cat $abs_srcdir/channel/channel_test.ok > expout -AT_CHECK([$abs_top_builddir/tests/channel/channel_test], [], [expout], [ignore]) -AT_CLEANUP - AT_SETUP([abis]) AT_KEYWORDS([abis]) cat $abs_srcdir/abis/abis_test.ok > expout -- cgit v1.2.3