msuraev submitted this change.

View Change

Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve msuraev: Looks good to me, approved Jenkins Builder: Verified
tests: use common stubs for SMS queue test

Related: OS#5568
Change-Id: Ic854eb919e6fcc82bd0245f62c72985b938c6b7a
---
M tests/sms_queue/Makefile.am
M tests/sms_queue/sms_queue_test.c
M tests/stubs.c
3 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/tests/sms_queue/Makefile.am b/tests/sms_queue/Makefile.am
index daf056a..c83a946 100644
--- a/tests/sms_queue/Makefile.am
+++ b/tests/sms_queue/Makefile.am
@@ -12,6 +12,7 @@
$(LIBOSMOABIS_CFLAGS) \
$(LIBOSMOSIGTRAN_CFLAGS) \
$(LIBOSMORANAP_CFLAGS) \
+ $(LIBOSMONETIF_CFLAGS) \
$(LIBASN1C_CFLAGS) \
$(LIBOSMOMGCPCLIENT_CFLAGS) \
$(LIBOSMOGSUPCLIENT_CFLAGS) \
@@ -29,6 +30,7 @@

sms_queue_test_SOURCES = \
sms_queue_test.c \
+ $(srcdir)/../stubs.c \
$(NULL)

sms_queue_test_LDADD = \
diff --git a/tests/sms_queue/sms_queue_test.c b/tests/sms_queue/sms_queue_test.c
index f681657..cc78e14 100644
--- a/tests/sms_queue/sms_queue_test.c
+++ b/tests/sms_queue/sms_queue_test.c
@@ -277,24 +277,3 @@

return 0;
}
-
-void osmo_stream_srv_link_set_data(struct osmo_stream_srv_link *link, void *data) {}
-struct osmo_fd *osmo_stream_srv_get_ofd(struct osmo_stream_srv *srv) { return NULL; }
-void osmo_stream_srv_destroy(struct osmo_stream_srv *conn) {}
-struct osmo_stream_srv *osmo_stream_srv_create(void *ctx, struct osmo_stream_srv_link *link,
- int fd, int (*cb)(struct osmo_stream_srv *conn),
- int (*closed_cb)(struct osmo_stream_srv *conn),
- void *data) { return NULL; }
-void osmo_stream_srv_send(struct osmo_stream_srv *conn, struct msgb *msg) {}
-void osmo_stream_srv_link_set_proto(struct osmo_stream_srv_link *link, uint16_t proto) {}
-struct osmo_fd *osmo_stream_srv_link_get_ofd(struct osmo_stream_srv_link *link) { return NULL; }
-struct osmo_stream_srv_link *osmo_stream_srv_link_create(void *ctx) { return NULL; }
-void *osmo_stream_srv_get_data(struct osmo_stream_srv *conn) { return NULL; }
-void osmo_stream_srv_link_set_nodelay(struct osmo_stream_srv_link *link, bool nodelay) {}
-void osmo_stream_srv_link_set_accept_cb(struct osmo_stream_srv_link *link, int (*accept_cb)
- (struct osmo_stream_srv_link *link, int fd)) {}
-int osmo_stream_srv_link_open(struct osmo_stream_srv_link *link) { return 0; }
-void *osmo_stream_srv_link_get_data(struct osmo_stream_srv_link *link) { return NULL; }
-void osmo_stream_srv_link_set_port(struct osmo_stream_srv_link *link, uint16_t port) {}
-void osmo_stream_srv_link_set_addr(struct osmo_stream_srv_link *link, const char *addr) {}
-int sctp_recvmsg(int sd, void *msg, size_t len, void *from, void *fromlen, void *info, int *msg_flags) { return 0; }
diff --git a/tests/stubs.c b/tests/stubs.c
index d011a31..e6ef548 100644
--- a/tests/stubs.c
+++ b/tests/stubs.c
@@ -37,7 +37,9 @@
void osmo_stream_srv_link_set_accept_cb(struct osmo_stream_srv_link *link, int (*accept_cb)
(struct osmo_stream_srv_link *link, int fd)) {}
int osmo_stream_srv_link_open(struct osmo_stream_srv_link *link) { return 0; }
+void osmo_stream_srv_link_close(struct osmo_stream_srv_link *link) {}
void *osmo_stream_srv_link_get_data(struct osmo_stream_srv_link *link) { return NULL; }
+char *osmo_stream_srv_link_get_sockname(const struct osmo_stream_srv_link *link) { return NULL; }
void osmo_stream_srv_link_set_port(struct osmo_stream_srv_link *link, uint16_t port) {}
void osmo_stream_srv_link_set_addr(struct osmo_stream_srv_link *link, const char *addr) {}
int sctp_recvmsg(int sd, void *msg, size_t len, void *from, void *fromlen, void *info, int *msg_flags) { return 0; }

To view, visit change 28842. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: Ic854eb919e6fcc82bd0245f62c72985b938c6b7a
Gerrit-Change-Number: 28842
Gerrit-PatchSet: 5
Gerrit-Owner: msuraev <msuraev@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: msuraev <msuraev@sysmocom.de>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>
Gerrit-MessageType: merged