tests: Share the stub between the paging and ciphering tests

5 files changed, 50 insertions, 86 deletions

diff --git a/tests/cipher/Makefile.am b/tests/cipher/Makefile.am
index bd6f15b3..14648c7a 100644
--- a/tests/cipher/Makefile.am
+++ b/tests/cipher/Makefile.am
@@ -4,5 +4,5 @@ LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_
 noinst_PROGRAMS = cipher_test
 EXTRA_DIST = cipher_test.ok
 
-cipher_test_SOURCES = cipher_test.c
+cipher_test_SOURCES = cipher_test.c $(srcdir)/../stubs.c
 cipher_test_LDADD = $(top_builddir)/src/common/libbts.a $(LDADD)
diff --git a/tests/cipher/cipher_test.c b/tests/cipher/cipher_test.c
index 9de18d96..16d5f707 100644
--- a/tests/cipher/cipher_test.c
+++ b/tests/cipher/cipher_test.c
@@ -88,45 +88,3 @@ int main(int argc, char **argv)
 	return 0;
 }
 
-/* stub to link */
-const uint8_t abis_mac[6] = { 0,1,2,3,4,5 };
-const char *software_version = "0815";
-
-int bts_model_chg_adm_state(struct gsm_bts *bts, struct gsm_abis_mo *mo,
-			    void *obj, uint8_t adm_state)
-{ return 0; }
-int bts_model_init(struct gsm_bts *bts)
-{ return 0; }
-int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg,
-			struct tlv_parsed *new_attr, void *obj)
-{ return 0; }
-int bts_model_rsl_chan_rel(struct gsm_lchan *lchan)
-{ return 0;}
-
-int bts_model_rsl_deact_sacch(struct gsm_lchan *lchan)
-{ return 0; }
-
-int bts_model_trx_deact_rf(struct gsm_bts_trx *trx)
-{ return 0; }
-int bts_model_trx_close(struct gsm_bts_trx *trx)
-{ return 0; }
-int bts_model_check_oml(struct gsm_bts *bts, uint8_t msg_type,
-			struct tlv_parsed *old_attr, struct tlv_parsed *new_attr,
-			void *obj)
-{ return 0; }
-int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo,
-		      void *obj)
-{ return 0; }
-int bts_model_rsl_chan_act(struct gsm_lchan *lchan, struct tlv_parsed *tp)
-{ return 0; }
-int bts_model_rsl_mode_modify(struct gsm_lchan *lchan)
-{ return 0; }
-void bts_model_rtp_rx_cb(struct osmo_rtp_socket *rs, const uint8_t *rtp_pl,
-			 unsigned int rtp_pl_len) {}
-
-int l1if_pdch_req(struct gsm_bts_trx_ts *ts, int is_ptcch, uint32_t fn,
-        uint16_t arfcn, uint8_t block_nr, uint8_t *data, uint8_t len)
-{ return 0; }
-
-uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx)
-{ return 0; }
diff --git a/tests/paging/Makefile.am b/tests/paging/Makefile.am
index 91059821..21424294 100644
--- a/tests/paging/Makefile.am
+++ b/tests/paging/Makefile.am
@@ -4,5 +4,5 @@ LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_
 noinst_PROGRAMS = paging_test
 EXTRA_DIST = paging_test.ok
 
-paging_test_SOURCES = paging_test.c
+paging_test_SOURCES = paging_test.c $(srcdir)/../stubs.c
 paging_test_LDADD = $(top_builddir)/src/common/libbts.a $(LDADD)
diff --git a/tests/paging/paging_test.c b/tests/paging/paging_test.c
index ae02b618..9f6b74cf 100644
--- a/tests/paging/paging_test.c
+++ b/tests/paging/paging_test.c
@@ -122,45 +122,3 @@ int main(int argc, char **argv)
 	return 0;
 }
 
-/* stub to link */
-const uint8_t abis_mac[6] = { 0,1,2,3,4,5 };
-const char *software_version = "0815";
-
-int bts_model_chg_adm_state(struct gsm_bts *bts, struct gsm_abis_mo *mo,
-			    void *obj, uint8_t adm_state)
-{ return 0; }
-int bts_model_init(struct gsm_bts *bts)
-{ return 0; }
-int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg,
-			struct tlv_parsed *new_attr, void *obj)
-{ return 0; }
-int bts_model_rsl_chan_rel(struct gsm_lchan *lchan)
-{ return 0;}
-
-int bts_model_rsl_deact_sacch(struct gsm_lchan *lchan)
-{ return 0; }
-
-int bts_model_trx_deact_rf(struct gsm_bts_trx *trx)
-{ return 0; }
-int bts_model_trx_close(struct gsm_bts_trx *trx)
-{ return 0; }
-int bts_model_check_oml(struct gsm_bts *bts, uint8_t msg_type,
-			struct tlv_parsed *old_attr, struct tlv_parsed *new_attr,
-			void *obj)
-{ return 0; }
-int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo,
-		      void *obj)
-{ return 0; }
-int bts_model_rsl_chan_act(struct gsm_lchan *lchan, struct tlv_parsed *tp)
-{ return 0; }
-int bts_model_rsl_mode_modify(struct gsm_lchan *lchan)
-{ return 0; }
-void bts_model_rtp_rx_cb(struct osmo_rtp_socket *rs, const uint8_t *rtp_pl,
-			 unsigned int rtp_pl_len) {}
-
-int l1if_pdch_req(struct gsm_bts_trx_ts *ts, int is_ptcch, uint32_t fn,
-        uint16_t arfcn, uint8_t block_nr, uint8_t *data, uint8_t len)
-{ return 0; }
-
-uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx)
-{ return 0; }
diff --git a/tests/stubs.c b/tests/stubs.c
new file mode 100644
index 00000000..c46bb4ad
--- /dev/null
+++ b/tests/stubs.c
@@ -0,0 +1,48 @@
+#include <osmo-bts/bts.h>
+
+/*
+ * Stubs to provide an empty bts model implementation for testing.
+ * If we ever want to re-define such a symbol we can make them weak
+ * here.
+ */
+const uint8_t abis_mac[6] = { 0,1,2,3,4,5 };
+const char *software_version = "0815";
+
+int bts_model_chg_adm_state(struct gsm_bts *bts, struct gsm_abis_mo *mo,
+			    void *obj, uint8_t adm_state)
+{ return 0; }
+int bts_model_init(struct gsm_bts *bts)
+{ return 0; }
+int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg,
+			struct tlv_parsed *new_attr, void *obj)
+{ return 0; }
+int bts_model_rsl_chan_rel(struct gsm_lchan *lchan)
+{ return 0;}
+
+int bts_model_rsl_deact_sacch(struct gsm_lchan *lchan)
+{ return 0; }
+
+int bts_model_trx_deact_rf(struct gsm_bts_trx *trx)
+{ return 0; }
+int bts_model_trx_close(struct gsm_bts_trx *trx)
+{ return 0; }
+int bts_model_check_oml(struct gsm_bts *bts, uint8_t msg_type,
+			struct tlv_parsed *old_attr, struct tlv_parsed *new_attr,
+			void *obj)
+{ return 0; }
+int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo,
+		      void *obj)
+{ return 0; }
+int bts_model_rsl_chan_act(struct gsm_lchan *lchan, struct tlv_parsed *tp)
+{ return 0; }
+int bts_model_rsl_mode_modify(struct gsm_lchan *lchan)
+{ return 0; }
+void bts_model_rtp_rx_cb(struct osmo_rtp_socket *rs, const uint8_t *rtp_pl,
+			 unsigned int rtp_pl_len) {}
+
+int l1if_pdch_req(struct gsm_bts_trx_ts *ts, int is_ptcch, uint32_t fn,
+        uint16_t arfcn, uint8_t block_nr, uint8_t *data, uint8_t len)
+{ return 0; }
+
+uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx)
+{ return 0; }