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

[pespin]

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

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

meas_tests: Avoid redefining all bts_model stubs

Change-Id: I47755e354a8cbcf34406de8bfc3985c70076fbf2
---
M tests/meas/Makefile.am
M tests/meas/meas_test.c
2 files changed, 1 insertion(+), 86 deletions(-)

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



diff --git a/tests/meas/Makefile.am b/tests/meas/Makefile.am
index d8fa118..c04106e 100644
--- a/tests/meas/Makefile.am
+++ b/tests/meas/Makefile.am
@@ -5,5 +5,5 @@
 noinst_HEADERS = sysmobts_fr_samples.h meas_testcases.h
 EXTRA_DIST = meas_test.ok
 
-meas_test_SOURCES = meas_test.c
+meas_test_SOURCES = meas_test.c $(srcdir)/../stubs.c
 meas_test_LDADD = $(top_builddir)/src/common/libbts.a $(LDADD)
diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c
index f414b60..309a522 100644
--- a/tests/meas/meas_test.c
+++ b/tests/meas/meas_test.c
@@ -588,88 +588,3 @@
 
 	return 0;
 }
-
-/* Stubs */
-void bts_model_abis_close(struct gsm_bts *bts)
-{
-}
-
-int bts_model_oml_estab(struct gsm_bts *bts)
-{
-	return 0;
-}
-
-int bts_model_l1sap_down(struct gsm_bts_trx *trx, struct osmo_phsap_prim *l1sap)
-{
-	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_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;
-}

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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I47755e354a8cbcf34406de8bfc3985c70076fbf2
Gerrit-Change-Number: 18900
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/77c5fa6f/attachment.htm>