fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36195?usp=email ) Change subject: stp: fix -latest: add missing f_osmo_repo_is() checks ...................................................................... stp: fix -latest: add missing f_osmo_repo_is() checks Change-Id: I9b00d3a72c5a2ad669dbaef65eec792a4c91785d Related: SYS#5424 --- M stp/STP_Tests_M3UA.ttcn 1 file changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/95/36195/1 diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 9f3bf0c..a7dcd78 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -326,6 +326,12 @@ var OptionList opt_list := {}; var M3uaConfig m3cfg := mp_m3ua_configs[i]; + /* XXX: M3UA-over-TCP is not supported by osmo-stp <= 1.8.1 */ + if (not Misc_Helpers.f_osmo_repo_is("nightly") and m3cfg.use_tcp) { + log("Not listen()ing m3cfg := ", m3cfg, " (not supported by IUT)"); + return; + } + if (lengthof(mp_local_m3ua_ip) == 0 ) { setverdict(fail, "Empty local address trying to bind SCTP socket: ", mp_local_m3ua_ip); @@ -365,6 +371,11 @@ } for (i := 0; i < NR_M3UA; i:=i+1) { + /* XXX: M3UA-over-TCP is not supported by osmo-stp <= 1.8.1 */ + if (not Misc_Helpers.f_osmo_repo_is("nightly") and mp_m3ua_configs[i].use_tcp) { + log("Not connect()ing m3cfg := ", m3cfg, " (not supported by IUT)"); + continue; + } map(self:M3UA[i], system:M3UA_CODEC_PT); if (mp_m3ua_configs[i].use_tcp) { f_M3UA_connect_tcp(i); @@ -392,6 +403,11 @@ var PortEvent port_evt; for (i := NR_M3UA; i < NR_M3UA+NR_M3UA_SRV; i:=i+1) { + /* XXX: M3UA-over-TCP is not supported by osmo-stp <= 1.8.1 */ + if (not Misc_Helpers.f_osmo_repo_is("nightly") and mp_m3ua_configs[i].use_tcp) { + log("Not listen()ing m3cfg := ", m3cfg, " (not supported by IUT)"); + continue; + } map(self:M3UA[i], system:M3UA_CODEC_PT); /* bind+ listen */ f_M3UA_listen(i); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36195?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9b00d3a72c5a2ad669dbaef65eec792a4c91785d Gerrit-Change-Number: 36195 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria &lt;vyanitskiy(a)sysmocom.de&gt; Gerrit-MessageType: newchange