<p>Neels Hofmeyr has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9484">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tests: remove channel_test<br><br>Rationale: channel_test is trivial and useless, probably only exists as a<br>legacy from openbsc.git.<br><br>- it tests two printf()s of "(bts=45,trx=0,ts=3,ss=4)", hardly useful.<br>- it tests ts_subslots() behavior for dyn ts, which will soon be replaced by a<br> most trivial mapping that does no longer need complex dyn ts state<br> evaluation (when introducing the new timeslot FSM to handle dyn TS switchover).<br><br>Change-Id: Ib2232da8e7fa964b92492d7b778320401dc97703<br>---<br>M configure.ac<br>M tests/Makefile.am<br>D tests/channel/Makefile.am<br>D tests/channel/channel_test.c<br>D tests/channel/channel_test.ok<br>M tests/testsuite.at<br>6 files changed, 0 insertions(+), 153 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/84/9484/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configure.ac b/configure.ac</span><br><span>index c064fb9..25bcad7 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -175,7 +175,6 @@</span><br><span> tests/Makefile</span><br><span> tests/atlocal</span><br><span> tests/gsm0408/Makefile</span><br><span style="color: hsl(0, 100%, 40%);">- tests/channel/Makefile</span><br><span> tests/bsc/Makefile</span><br><span> tests/abis/Makefile</span><br><span> tests/subscr/Makefile</span><br><span>diff --git a/tests/Makefile.am b/tests/Makefile.am</span><br><span>index 7bbef99..95d836b 100644</span><br><span>--- a/tests/Makefile.am</span><br><span>+++ b/tests/Makefile.am</span><br><span>@@ -1,7 +1,6 @@</span><br><span> SUBDIRS = \</span><br><span> bsc \</span><br><span> gsm0408 \</span><br><span style="color: hsl(0, 100%, 40%);">- channel \</span><br><span> abis \</span><br><span> subscr \</span><br><span> nanobts_omlattr \</span><br><span>diff --git a/tests/channel/Makefile.am b/tests/channel/Makefile.am</span><br><span>deleted file mode 100644</span><br><span>index 26c6cff..0000000</span><br><span>--- a/tests/channel/Makefile.am</span><br><span>+++ /dev/null</span><br><span>@@ -1,32 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-AM_CPPFLAGS = \</span><br><span style="color: hsl(0, 100%, 40%);">- $(all_includes) \</span><br><span style="color: hsl(0, 100%, 40%);">- -I$(top_srcdir)/include \</span><br><span style="color: hsl(0, 100%, 40%);">- $(NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-AM_CFLAGS = \</span><br><span style="color: hsl(0, 100%, 40%);">- -Wall \</span><br><span style="color: hsl(0, 100%, 40%);">- -ggdb3 \</span><br><span style="color: hsl(0, 100%, 40%);">- $(LIBOSMOCORE_CFLAGS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(LIBOSMOGSM_CFLAGS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(LIBOSMOABIS_CFLAGS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-EXTRA_DIST = \</span><br><span style="color: hsl(0, 100%, 40%);">- channel_test.ok \</span><br><span style="color: hsl(0, 100%, 40%);">- $(NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-noinst_PROGRAMS = \</span><br><span style="color: hsl(0, 100%, 40%);">- channel_test \</span><br><span style="color: hsl(0, 100%, 40%);">- $(NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-channel_test_SOURCES = \</span><br><span style="color: hsl(0, 100%, 40%);">- channel_test.c \</span><br><span style="color: hsl(0, 100%, 40%);">- $(NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-channel_test_LDADD = \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/gsm_data.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/net_init.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(LIBOSMOCORE_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(LIBOSMOGSM_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(LIBOSMOABIS_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(NULL)</span><br><span>diff --git a/tests/channel/channel_test.c b/tests/channel/channel_test.c</span><br><span>deleted file mode 100644</span><br><span>index 4c2f9cd..0000000</span><br><span>--- a/tests/channel/channel_test.c</span><br><span>+++ /dev/null</span><br><span>@@ -1,111 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/*</span><br><span style="color: hsl(0, 100%, 40%);">- * (C) 2009 by Holger Hans Peter Freyther <zecke@selfish.org></span><br><span style="color: hsl(0, 100%, 40%);">- * All Rights Reserved</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(0, 100%, 40%);">- * it under the terms of the GNU Affero General Public License as published by</span><br><span style="color: hsl(0, 100%, 40%);">- * the Free Software Foundation; either version 3 of the License, or</span><br><span style="color: hsl(0, 100%, 40%);">- * (at your option) any later version.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(0, 100%, 40%);">- * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(0, 100%, 40%);">- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(0, 100%, 40%);">- * GNU General Public License for more details.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * You should have received a copy of the GNU Affero General Public License</span><br><span style="color: hsl(0, 100%, 40%);">- * along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <stdio.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <stdlib.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <assert.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/core/application.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/core/select.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/abis_rsl.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/debug.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void *ctx = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void test_bts_debug_print(void)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_network *network;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts *bts;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts_trx *trx;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Testing the lchan printing:");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Create a dummy network */</span><br><span style="color: hsl(0, 100%, 40%);">- network = gsm_network_init(ctx);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!network)</span><br><span style="color: hsl(0, 100%, 40%);">- exit(1);</span><br><span style="color: hsl(0, 100%, 40%);">- /* Add a BTS with some reasonanbly non-zero id */</span><br><span style="color: hsl(0, 100%, 40%);">- bts = gsm_bts_alloc(network, 45);</span><br><span style="color: hsl(0, 100%, 40%);">- /* Add a second TRX to test on multiple TRXs */</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_trx_alloc(bts);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(trx, &bts->trx_list, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- char *name = gsm_lchan_name(&trx->ts[3].lchan[4]);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (name)</span><br><span style="color: hsl(0, 100%, 40%);">- printf(" %s", name);</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- printf("NULL name");</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- printf("\n");</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void test_dyn_ts_subslots(void)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts_trx_ts ts;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Testing subslot numbers for pchan types\n");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ts.pchan = GSM_PCHAN_TCH_F;</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(ts_subslots(&ts) == 1);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ts.pchan = GSM_PCHAN_TCH_H;</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(ts_subslots(&ts) == 2);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ts.pchan = GSM_PCHAN_PDCH;</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(ts_subslots(&ts) == 0);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ts.pchan = GSM_PCHAN_TCH_F_PDCH;</span><br><span style="color: hsl(0, 100%, 40%);">- ts.flags = 0; /* TCH_F mode */</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(ts_subslots(&ts) == 1);</span><br><span style="color: hsl(0, 100%, 40%);">- ts.flags = TS_F_PDCH_ACTIVE;</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(ts_subslots(&ts) == 0);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ts.pchan = GSM_PCHAN_TCH_F_TCH_H_PDCH;</span><br><span style="color: hsl(0, 100%, 40%);">- ts.dyn.pchan_is = GSM_PCHAN_TCH_F;</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(ts_subslots(&ts) == 1);</span><br><span style="color: hsl(0, 100%, 40%);">- ts.dyn.pchan_is = GSM_PCHAN_TCH_H;</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(ts_subslots(&ts) == 2);</span><br><span style="color: hsl(0, 100%, 40%);">- ts.dyn.pchan_is = GSM_PCHAN_PDCH;</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(ts_subslots(&ts) == 0);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static const struct log_info_cat log_categories[] = {</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static const struct log_info log_info = {</span><br><span style="color: hsl(0, 100%, 40%);">- .cat = log_categories,</span><br><span style="color: hsl(0, 100%, 40%);">- .num_cat = ARRAY_SIZE(log_categories),</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int main(int argc, char **argv)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- ctx = talloc_named_const(NULL, 0, "channel_test");</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_init_logging2(ctx, &log_info);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- test_dyn_ts_subslots();</span><br><span style="color: hsl(0, 100%, 40%);">- test_bts_debug_print();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return EXIT_SUCCESS;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-bool on_gsm_ts_init(struct gsm_bts_trx_ts *ts) { return true; }</span><br><span>diff --git a/tests/channel/channel_test.ok b/tests/channel/channel_test.ok</span><br><span>deleted file mode 100644</span><br><span>index 81d6569..0000000</span><br><span>--- a/tests/channel/channel_test.ok</span><br><span>+++ /dev/null</span><br><span>@@ -1,2 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Testing subslot numbers for pchan types</span><br><span style="color: hsl(0, 100%, 40%);">-Testing the lchan printing: (bts=45,trx=0,ts=3,ss=4) (bts=45,trx=1,ts=3,ss=4)</span><br><span>diff --git a/tests/testsuite.at b/tests/testsuite.at</span><br><span>index 974af89..515ffa0 100644</span><br><span>--- a/tests/testsuite.at</span><br><span>+++ b/tests/testsuite.at</span><br><span>@@ -14,12 +14,6 @@</span><br><span> AT_CHECK([$abs_top_builddir/tests/subscr/bsc_subscr_test], [], [expout], [experr])</span><br><span> AT_CLEANUP</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AT_SETUP([channel])</span><br><span style="color: hsl(0, 100%, 40%);">-AT_KEYWORDS([channel])</span><br><span style="color: hsl(0, 100%, 40%);">-cat $abs_srcdir/channel/channel_test.ok > expout</span><br><span style="color: hsl(0, 100%, 40%);">-AT_CHECK([$abs_top_builddir/tests/channel/channel_test], [], [expout], [ignore])</span><br><span style="color: hsl(0, 100%, 40%);">-AT_CLEANUP</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> AT_SETUP([abis])</span><br><span> AT_KEYWORDS([abis])</span><br><span> cat $abs_srcdir/abis/abis_test.ok > expout</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9484">change 9484</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/9484"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ib2232da8e7fa964b92492d7b778320401dc97703 </div>
<div style="display:none"> Gerrit-Change-Number: 9484 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>