Change in osmo-bts[master]: handover_tests: Avoid redefining all bts_model stubs

[pespin]

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18899 )

Change subject: handover_tests: Avoid redefining all bts_model stubs
......................................................................

handover_tests: Avoid redefining all bts_model stubs

Change-Id: I366f71474891d32e31dbba1a9fa1f9a510fa0952
---
M tests/handover/Makefile.am
M tests/handover/handover_test.c
M tests/stubs.c
3 files changed, 4 insertions(+), 19 deletions(-)

Approvals:
  Jenkins Builder: Verified
  fixeria: Looks good to me, approved



diff --git a/tests/handover/Makefile.am b/tests/handover/Makefile.am
index 966ea46..53d09c9 100644
--- a/tests/handover/Makefile.am
+++ b/tests/handover/Makefile.am
@@ -4,5 +4,5 @@
 noinst_PROGRAMS = handover_test
 EXTRA_DIST = handover_test.ok
 
-handover_test_SOURCES = handover_test.c
+handover_test_SOURCES = handover_test.c $(srcdir)/../stubs.c
 handover_test_LDADD = $(top_builddir)/src/common/libbts.a $(LDADD)
diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c
index c9799af..72d8dc8 100644
--- a/tests/handover/handover_test.c
+++ b/tests/handover/handover_test.c
@@ -268,18 +268,3 @@
 		msgb_free(msg);
 	return rc;
 }
-
-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_apply_oml(struct gsm_bts *bts, struct msgb *msg, struct tlv_parsed *new_attr, int obj_kind, void *obj) { return 0; }
-int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo, void *obj) { return 0; }
-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_trx_init(struct gsm_bts_trx *trx) { 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; }
-void trx_get_hlayer1(void) {}
-int bts_model_adjst_ms_pwr(struct gsm_lchan *lchan) { return 0; }
-int bts_model_ts_disconnect(struct gsm_bts_trx_ts *ts) { return 0; }
-void bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan) { return; }
-int bts_model_lchan_deactivate(struct gsm_lchan *lchan) { return 0; }
-int bts_model_lchan_deactivate_sacch(struct gsm_lchan *lchan) { return 0; }
diff --git a/tests/stubs.c b/tests/stubs.c
index 7c64034..28a509e 100644
--- a/tests/stubs.c
+++ b/tests/stubs.c
@@ -30,13 +30,13 @@
 int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo,
 		      void *obj)
 { return 0; }
-int bts_model_l1sap_down(struct gsm_bts_trx *trx, struct osmo_phsap_prim *l1sap)
+__attribute__((weak)) int bts_model_l1sap_down(struct gsm_bts_trx *trx, struct osmo_phsap_prim *l1sap)
 { return 0; }
 
 uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx)
 { return 0; }
 
-int bts_model_oml_estab(struct gsm_bts *bts)
+__attribute__((weak)) int bts_model_oml_estab(struct gsm_bts *bts)
 { return 0; }
 
 int l1if_set_txpower(struct femtol1_hdl *fl1h, float tx_power)
@@ -48,7 +48,7 @@
 int bts_model_adjst_ms_pwr(struct gsm_lchan *lchan)
 { return 0; }
 
-void bts_model_abis_close(struct gsm_bts *bts)
+__attribute__((weak)) void bts_model_abis_close(struct gsm_bts *bts)
 { }
 
 int bts_model_ts_disconnect(struct gsm_bts_trx_ts *ts)

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18899
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I366f71474891d32e31dbba1a9fa1f9a510fa0952
Gerrit-Change-Number: 18899
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200618/7d1c0ebb/attachment.htm>