<p>osmith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-hlr/+/16199">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">remove gsup_test<br><br>The test doesn't do much: it encodes an Insert Subscriber Data request for the<br>sole purpose to ensure the msgb is allocated large enough. A bug like that is<br>easily avoided statically.<br><br>Also, the lu functions will get refactored soon, it doesn't make sense to me to<br>drag this test along.<br><br>Change-Id: I42e1c72bf4cce8034f968cd4392773bf2b643c1b<br>---<br>M configure.ac<br>M tests/Makefile.am<br>D tests/gsup/Makefile.am<br>D tests/gsup/gsup_test.c<br>D tests/gsup/gsup_test.err<br>D tests/gsup/gsup_test.ok<br>M tests/testsuite.at<br>7 files changed, 0 insertions(+), 145 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configure.ac b/configure.ac</span><br><span>index f7714aa..d39edb2 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -186,7 +186,6 @@</span><br><span> tests/auc/Makefile</span><br><span> tests/auc/gen_ts_55_205_test_sets/Makefile</span><br><span> tests/gsup_server/Makefile</span><br><span style="color: hsl(0, 100%, 40%);">- tests/gsup/Makefile</span><br><span> tests/db/Makefile</span><br><span> tests/db_upgrade/Makefile</span><br><span> )</span><br><span>diff --git a/tests/Makefile.am b/tests/Makefile.am</span><br><span>index 62001f6..f8591a5 100644</span><br><span>--- a/tests/Makefile.am</span><br><span>+++ b/tests/Makefile.am</span><br><span>@@ -2,7 +2,6 @@</span><br><span> auc \</span><br><span> gsup_server \</span><br><span> db \</span><br><span style="color: hsl(0, 100%, 40%);">- gsup \</span><br><span> db_upgrade \</span><br><span> $(NULL)</span><br><span> </span><br><span>diff --git a/tests/gsup/Makefile.am b/tests/gsup/Makefile.am</span><br><span>deleted file mode 100644</span><br><span>index 2f56504..0000000</span><br><span>--- a/tests/gsup/Makefile.am</span><br><span>+++ /dev/null</span><br><span>@@ -1,42 +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%);">- $(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%);">- -I$(top_srcdir)/include \</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%);">-AM_LDFLAGS = \</span><br><span style="color: hsl(0, 100%, 40%);">- -no-install \</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%);">- gsup_test.ok \</span><br><span style="color: hsl(0, 100%, 40%);">- gsup_test.err \</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%);">- gsup_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%);">-gsup_test_SOURCES = \</span><br><span style="color: hsl(0, 100%, 40%);">- gsup_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%);">-gsup_test_LDADD = \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_srcdir)/src/luop.c \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_srcdir)/src/gsup_server.c \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_srcdir)/src/gsup_router.c \</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 style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-.PHONY: update_exp</span><br><span style="color: hsl(0, 100%, 40%);">-update_exp:</span><br><span style="color: hsl(0, 100%, 40%);">- $(builddir)/gsup_test >"$(srcdir)/gsup_test.ok" 2>"$(srcdir)/gsup_test.err"</span><br><span>diff --git a/tests/gsup/gsup_test.c b/tests/gsup/gsup_test.c</span><br><span>deleted file mode 100644</span><br><span>index a41ba88..0000000</span><br><span>--- a/tests/gsup/gsup_test.c</span><br><span>+++ /dev/null</span><br><span>@@ -1,91 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/* (C) 2018 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de></span><br><span style="color: hsl(0, 100%, 40%);">- *</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 Affero 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 <string.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/core/logging.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/core/utils.h></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/gsm/gsup.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/hlr/logging.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/hlr/luop.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct osmo_gsup_server;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* override osmo_gsup_addr_send() to not actually send anything. */</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_gsup_addr_send(struct osmo_gsup_server *gs,</span><br><span style="color: hsl(0, 100%, 40%);">- const uint8_t *addr, size_t addrlen,</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMAIN, LOGL_DEBUG, "%s\n", msgb_hexdump(msg));</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_free(msg);</span><br><span style="color: hsl(0, 100%, 40%);">- return 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%);">-int db_subscr_get_by_imsi(struct db_context *dbc, const char *imsi,</span><br><span style="color: hsl(0, 100%, 40%);">- struct hlr_subscriber *subscr)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- return 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%);">-/* Verify that the internally allocated msgb is large enough */</span><br><span style="color: hsl(0, 100%, 40%);">-void test_gsup_tx_insert_subscr_data()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct lu_operation luop = {</span><br><span style="color: hsl(0, 100%, 40%);">- .state = LU_S_LU_RECEIVED,</span><br><span style="color: hsl(0, 100%, 40%);">- .subscr = {</span><br><span style="color: hsl(0, 100%, 40%);">- .imsi = "123456789012345",</span><br><span style="color: hsl(0, 100%, 40%);">- .msisdn = "987654321098765",</span><br><span style="color: hsl(0, 100%, 40%);">- .nam_cs = true,</span><br><span style="color: hsl(0, 100%, 40%);">- .nam_ps = true,</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- .is_ps = true,</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%);">- lu_op_tx_insert_subscr_data(&luop);</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%);">-const struct log_info_cat default_categories[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- [DMAIN] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "DMAIN",</span><br><span style="color: hsl(0, 100%, 40%);">- .description = "Main Program",</span><br><span style="color: hsl(0, 100%, 40%);">- .enabled = 1, .loglevel = LOGL_DEBUG,</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%);">-static struct log_info info = {</span><br><span style="color: hsl(0, 100%, 40%);">- .cat = default_categories,</span><br><span style="color: hsl(0, 100%, 40%);">- .num_cat = ARRAY_SIZE(default_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%);">- void *ctx = talloc_named_const(NULL, 0, "gsup_test");</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_init_logging2(ctx, &info);</span><br><span style="color: hsl(0, 100%, 40%);">- log_set_print_filename(osmo_stderr_target, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- log_set_print_timestamp(osmo_stderr_target, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- log_set_use_color(osmo_stderr_target, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- log_set_print_category(osmo_stderr_target, 1);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- test_gsup_tx_insert_subscr_data();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Done.\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return EXIT_SUCCESS;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span>diff --git a/tests/gsup/gsup_test.err b/tests/gsup/gsup_test.err</span><br><span>deleted file mode 100644</span><br><span>index 0aeae30..0000000</span><br><span>--- a/tests/gsup/gsup_test.err</span><br><span>+++ /dev/null</span><br><span>@@ -1,2 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-DMAIN 10 01 08 21 43 65 87 09 21 43 f5 08 09 08 89 67 45 23 01 89 67 f5 05 07 10 01 01 12 02 01 2a 28 01 01 </span><br><span style="color: hsl(0, 100%, 40%);">-DMAIN LU OP state change: LU RECEIVED -> ISD SENT</span><br><span>diff --git a/tests/gsup/gsup_test.ok b/tests/gsup/gsup_test.ok</span><br><span>deleted file mode 100644</span><br><span>index 619c561..0000000</span><br><span>--- a/tests/gsup/gsup_test.ok</span><br><span>+++ /dev/null</span><br><span>@@ -1 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Done.</span><br><span>diff --git a/tests/testsuite.at b/tests/testsuite.at</span><br><span>index bd758c9..58c197d 100644</span><br><span>--- a/tests/testsuite.at</span><br><span>+++ b/tests/testsuite.at</span><br><span>@@ -15,13 +15,6 @@</span><br><span> AT_CHECK([$abs_top_builddir/tests/auc/auc_ts_55_205_test_sets], [], [expout], [experr])</span><br><span> AT_CLEANUP</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AT_SETUP([gsup])</span><br><span style="color: hsl(0, 100%, 40%);">-AT_KEYWORDS([gsup])</span><br><span style="color: hsl(0, 100%, 40%);">-cat $abs_srcdir/gsup/gsup_test.ok > expout</span><br><span style="color: hsl(0, 100%, 40%);">-cat $abs_srcdir/gsup/gsup_test.err > experr</span><br><span style="color: hsl(0, 100%, 40%);">-AT_CHECK([$abs_top_builddir/tests/gsup/gsup_test], [], [expout], [experr])</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([gsup_server])</span><br><span> AT_KEYWORDS([gsup_server])</span><br><span> cat $abs_srcdir/gsup_server/gsup_server_test.ok > expout</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-hlr/+/16199">change 16199</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/c/osmo-hlr/+/16199"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-hlr </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I42e1c72bf4cce8034f968cd4392773bf2b643c1b </div>
<div style="display:none"> Gerrit-Change-Number: 16199 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>