<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/14352">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tests: share stubs.h from msc_vlr_test as stubs.c<br><br>Change-Id: I8846c940f2695fd33e1007fecac83e73f508bb34<br>---<br>M tests/msc_vlr/Makefile.am<br>M tests/msc_vlr/msc_vlr_test_authen_reuse.c<br>M tests/msc_vlr/msc_vlr_test_call.c<br>M tests/msc_vlr/msc_vlr_test_gsm_authen.c<br>M tests/msc_vlr/msc_vlr_test_gsm_ciph.c<br>M tests/msc_vlr/msc_vlr_test_hlr_reject.c<br>M tests/msc_vlr/msc_vlr_test_hlr_timeout.c<br>M tests/msc_vlr/msc_vlr_test_ms_timeout.c<br>M tests/msc_vlr/msc_vlr_test_no_authen.c<br>M tests/msc_vlr/msc_vlr_test_reject_concurrency.c<br>M tests/msc_vlr/msc_vlr_test_rest.c<br>M tests/msc_vlr/msc_vlr_test_ss.c<br>M tests/msc_vlr/msc_vlr_test_umts_authen.c<br>R tests/stubs.c<br>14 files changed, 16 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/52/14352/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/msc_vlr/Makefile.am b/tests/msc_vlr/Makefile.am</span><br><span>index f9a9224..ac53f0f 100644</span><br><span>--- a/tests/msc_vlr/Makefile.am</span><br><span>+++ b/tests/msc_vlr/Makefile.am</span><br><span>@@ -46,7 +46,6 @@</span><br><span> </span><br><span> noinst_HEADERS = \</span><br><span>         msc_vlr_tests.h \</span><br><span style="color: hsl(0, 100%, 40%);">-       stubs.h \</span><br><span>    $(NULL)</span><br><span> </span><br><span> EXTRA_DIST = \</span><br><span>@@ -94,61 +93,73 @@</span><br><span> msc_vlr_test_no_authen_SOURCES = \</span><br><span>    msc_vlr_test_no_authen.c \</span><br><span>   msc_vlr_tests.c \</span><br><span style="color: hsl(120, 100%, 40%);">+     $(srcdir)/../stubs.c \</span><br><span>       $(NULL)</span><br><span> </span><br><span> msc_vlr_test_gsm_authen_SOURCES = \</span><br><span>   msc_vlr_test_gsm_authen.c \</span><br><span>  msc_vlr_tests.c \</span><br><span style="color: hsl(120, 100%, 40%);">+     $(srcdir)/../stubs.c \</span><br><span>       $(NULL)</span><br><span> </span><br><span> msc_vlr_test_gsm_ciph_SOURCES = \</span><br><span>     msc_vlr_test_gsm_ciph.c \</span><br><span>    msc_vlr_tests.c \</span><br><span style="color: hsl(120, 100%, 40%);">+     $(srcdir)/../stubs.c \</span><br><span>       $(NULL)</span><br><span> </span><br><span> msc_vlr_test_umts_authen_SOURCES = \</span><br><span>  msc_vlr_test_umts_authen.c \</span><br><span>         msc_vlr_tests.c \</span><br><span style="color: hsl(120, 100%, 40%);">+     $(srcdir)/../stubs.c \</span><br><span>       $(NULL)</span><br><span> </span><br><span> msc_vlr_test_authen_reuse_SOURCES = \</span><br><span>         msc_vlr_test_authen_reuse.c \</span><br><span>        msc_vlr_tests.c \</span><br><span style="color: hsl(120, 100%, 40%);">+     $(srcdir)/../stubs.c \</span><br><span>       $(NULL)</span><br><span> </span><br><span> msc_vlr_test_hlr_reject_SOURCES = \</span><br><span>   msc_vlr_test_hlr_reject.c \</span><br><span>  msc_vlr_tests.c \</span><br><span style="color: hsl(120, 100%, 40%);">+     $(srcdir)/../stubs.c \</span><br><span>       $(NULL)</span><br><span> </span><br><span> msc_vlr_test_hlr_timeout_SOURCES = \</span><br><span>  msc_vlr_test_hlr_timeout.c \</span><br><span>         msc_vlr_tests.c \</span><br><span style="color: hsl(120, 100%, 40%);">+     $(srcdir)/../stubs.c \</span><br><span>       $(NULL)</span><br><span> </span><br><span> msc_vlr_test_ms_timeout_SOURCES = \</span><br><span>   msc_vlr_test_ms_timeout.c \</span><br><span>  msc_vlr_tests.c \</span><br><span style="color: hsl(120, 100%, 40%);">+     $(srcdir)/../stubs.c \</span><br><span>       $(NULL)</span><br><span> </span><br><span> msc_vlr_test_reject_concurrency_SOURCES = \</span><br><span>   msc_vlr_test_reject_concurrency.c \</span><br><span>  msc_vlr_tests.c \</span><br><span style="color: hsl(120, 100%, 40%);">+     $(srcdir)/../stubs.c \</span><br><span>       $(NULL)</span><br><span> </span><br><span> msc_vlr_test_call_SOURCES = \</span><br><span>         msc_vlr_test_call.c \</span><br><span>        msc_vlr_tests.c \</span><br><span style="color: hsl(120, 100%, 40%);">+     $(srcdir)/../stubs.c \</span><br><span>       $(NULL)</span><br><span> </span><br><span> msc_vlr_test_rest_SOURCES = \</span><br><span>         msc_vlr_test_rest.c \</span><br><span>        msc_vlr_tests.c \</span><br><span style="color: hsl(120, 100%, 40%);">+     $(srcdir)/../stubs.c \</span><br><span>       $(NULL)</span><br><span> </span><br><span> msc_vlr_test_ss_SOURCES = \</span><br><span>   msc_vlr_test_ss.c \</span><br><span>  msc_vlr_tests.c \</span><br><span style="color: hsl(120, 100%, 40%);">+     $(srcdir)/../stubs.c \</span><br><span>       $(NULL)</span><br><span> </span><br><span> .PHONY: update_exp</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.c b/tests/msc_vlr/msc_vlr_test_authen_reuse.c</span><br><span>index 9eadec7..d73a5f8 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_authen_reuse.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.c</span><br><span>@@ -24,7 +24,6 @@</span><br><span> /* NOTE that further auth re-use tests exist in msc_vlr_test_hlr_reject.c */</span><br><span> </span><br><span> #include "msc_vlr_tests.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "stubs.h"</span><br><span> </span><br><span> static void _test_auth_reuse(enum osmo_rat_type via_ran,</span><br><span>                            int set_max_reuse_count,</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c</span><br><span>index b31239e..6805f1a 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_call.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_call.c</span><br><span>@@ -22,7 +22,6 @@</span><br><span>  */</span><br><span> </span><br><span> #include "msc_vlr_tests.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "stubs.h"</span><br><span> </span><br><span> #include <osmocom/msc/gsm_04_08.h></span><br><span> </span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.c b/tests/msc_vlr/msc_vlr_test_gsm_authen.c</span><br><span>index 805ae64..8776e03 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_gsm_authen.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.c</span><br><span>@@ -22,7 +22,6 @@</span><br><span>  */</span><br><span> </span><br><span> #include "msc_vlr_tests.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "stubs.h"</span><br><span> </span><br><span> static void test_gsm_authen()</span><br><span> {</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c</span><br><span>index ceb17a5..c76cba4 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c</span><br><span>@@ -22,7 +22,6 @@</span><br><span>  */</span><br><span> </span><br><span> #include "msc_vlr_tests.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "stubs.h"</span><br><span> </span><br><span> static const struct osmo_gsm48_classmark classmark = {</span><br><span>        // TODO</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.c b/tests/msc_vlr/msc_vlr_test_hlr_reject.c</span><br><span>index 1134d89..45aaa8c 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_hlr_reject.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.c</span><br><span>@@ -22,7 +22,6 @@</span><br><span>  */</span><br><span> </span><br><span> #include "msc_vlr_tests.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "stubs.h"</span><br><span> </span><br><span> static void test_hlr_rej_auth_info_unknown_imsi()</span><br><span> {</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_hlr_timeout.c b/tests/msc_vlr/msc_vlr_test_hlr_timeout.c</span><br><span>index af5441b..abc7c5b 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_hlr_timeout.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_hlr_timeout.c</span><br><span>@@ -22,7 +22,6 @@</span><br><span>  */</span><br><span> </span><br><span> #include "msc_vlr_tests.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "stubs.h"</span><br><span> </span><br><span> #include <osmocom/core/logging.h></span><br><span> </span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.c b/tests/msc_vlr/msc_vlr_test_ms_timeout.c</span><br><span>index 450909f..91f00ef 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_ms_timeout.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.c</span><br><span>@@ -22,7 +22,6 @@</span><br><span>  */</span><br><span> </span><br><span> #include "msc_vlr_tests.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "stubs.h"</span><br><span> </span><br><span> static void test_ms_timeout_lu_auth_resp()</span><br><span> {</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.c b/tests/msc_vlr/msc_vlr_test_no_authen.c</span><br><span>index b3289f3..ae77252 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_no_authen.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_no_authen.c</span><br><span>@@ -22,7 +22,6 @@</span><br><span>  */</span><br><span> </span><br><span> #include "msc_vlr_tests.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "stubs.h"</span><br><span> </span><br><span> static void test_no_authen()</span><br><span> {</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.c b/tests/msc_vlr/msc_vlr_test_reject_concurrency.c</span><br><span>index 7eaedb2..fe53469 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.c</span><br><span>@@ -22,7 +22,6 @@</span><br><span>  */</span><br><span> </span><br><span> #include "msc_vlr_tests.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "stubs.h"</span><br><span> </span><br><span> static void test_reject_2nd_conn()</span><br><span> {</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_rest.c b/tests/msc_vlr/msc_vlr_test_rest.c</span><br><span>index 620652c..1b998ad 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_rest.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_rest.c</span><br><span>@@ -22,7 +22,7 @@</span><br><span>  */</span><br><span> </span><br><span> #include "msc_vlr_tests.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "stubs.h"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #include <osmocom/msc/vlr.h></span><br><span> </span><br><span> #if 0</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_ss.c b/tests/msc_vlr/msc_vlr_test_ss.c</span><br><span>index e4b3a4e..978ceae 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_ss.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_ss.c</span><br><span>@@ -21,7 +21,6 @@</span><br><span>  */</span><br><span> </span><br><span> #include "msc_vlr_tests.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "stubs.h"</span><br><span> </span><br><span> #define IMSI "901700000004620"</span><br><span> </span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.c b/tests/msc_vlr/msc_vlr_test_umts_authen.c</span><br><span>index cb8a032..a89b0d1 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_umts_authen.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_umts_authen.c</span><br><span>@@ -22,7 +22,6 @@</span><br><span>  */</span><br><span> </span><br><span> #include "msc_vlr_tests.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "stubs.h"</span><br><span> </span><br><span> static void _test_umts_authen(enum osmo_rat_type via_ran)</span><br><span> {</span><br><span>diff --git a/tests/msc_vlr/stubs.h b/tests/stubs.c</span><br><span>similarity index 96%</span><br><span>rename from tests/msc_vlr/stubs.h</span><br><span>rename to tests/stubs.c</span><br><span>index bf55baa..d011a31 100644</span><br><span>--- a/tests/msc_vlr/stubs.h</span><br><span>+++ b/tests/stubs.c</span><br><span>@@ -18,6 +18,9 @@</span><br><span>  *</span><br><span>  */</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/linuxlist.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/netif/stream.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void osmo_stream_srv_link_set_data(struct osmo_stream_srv_link *link, void *data) {}</span><br><span> struct osmo_fd *osmo_stream_srv_get_ofd(struct osmo_stream_srv *srv) { return NULL; }</span><br><span> void osmo_stream_srv_destroy(struct osmo_stream_srv *conn) {}</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/14352">change 14352</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-msc/+/14352"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I8846c940f2695fd33e1007fecac83e73f508bb34 </div>
<div style="display:none"> Gerrit-Change-Number: 14352 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>