Change in osmo-ttcn3-hacks[master]: BSC_Tests_CBSP.ttcn: Fix tons of compiler warnings

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19749 )

Change subject: BSC_Tests_CBSP.ttcn: Fix tons of compiler warnings
......................................................................

BSC_Tests_CBSP.ttcn: Fix tons of compiler warnings

the argument given to tr_ASP_RSL_UD() needs a 'present' qualifier, as it
cannot be 'omit'

 BSC_Tests_CBSP.ttcn:524.1-537.1: In testcase definition `TC_cbsp_write_lac':
  BSC_Tests_CBSP.ttcn:532.2-535.2: In interleave statement:
   BSC_Tests_CBSP.ttcn:533.5-41: In guard operation:
    BSC_Tests_CBSP.ttcn:533.5-41: In receive statement:
     BSC_Tests_CBSP.ttcn:533.37-40: In actual parameter list of template `@IPA_Emulation.tr_ASP_RSL_UD':
      BSC_Tests_CBSP.ttcn:533.38-39: In parameter #1 for `rsl':
       BSC_Tests_CBSP.ttcn:533.38-39: warning: Inadequate restriction on the referenced template variable `tr', this may cause a dynamic test case error at runtime
       BSC_Tests_CBSP.ttcn:531.27-82: note: Referenced template variable is here
   BSC_Tests_CBSP.ttcn:534.5-41: In guard operation:
    BSC_Tests_CBSP.ttcn:534.5-41: In receive statement:
     BSC_Tests_CBSP.ttcn:534.37-40: In actual parameter list of template `@IPA_Emulation.tr_ASP_RSL_UD':
      BSC_Tests_CBSP.ttcn:534.38-39: In parameter #1 for `rsl':
       BSC_Tests_CBSP.ttcn:534.38-39: warning: Inadequate restriction on the referenced template variable `tr', this may cause a dynamic test case error at runtime
       BSC_Tests_CBSP.ttcn:531.27-82: note: Referenced template variable is here

Change-Id: Id64e8e135b690c34293487304d7a175b5b56265b
---
M bsc/BSC_Tests_CBSP.ttcn
1 file changed, 6 insertions(+), 6 deletions(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved



diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn
index 497ff80..548c0c1 100644
--- a/bsc/BSC_Tests_CBSP.ttcn
+++ b/bsc/BSC_Tests_CBSP.ttcn
@@ -79,14 +79,14 @@
 	log("g_cbsp_msg_id=", g_cbsp_msg_id, "  g_cbsp_ser_no=", g_cbsp_ser_no);
 }
 
-private altstep as_IgnRSL(template RSL_Message tr) runs on cbsp_test_CT {
+private altstep as_IgnRSL(template (present) RSL_Message tr) runs on cbsp_test_CT {
 [] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr)) { repeat; }
 [] IPA_RSL[1].receive(tr_ASP_RSL_UD(tr)) { repeat; }
 [] IPA_RSL[2].receive(tr_ASP_RSL_UD(tr)) { repeat; }
 }
 
 private altstep as_FailRSL() runs on cbsp_test_CT {
-var template RSL_Message tr := (tr_RSL_SMSCB_CMD);
+var template (present) RSL_Message tr := (tr_RSL_SMSCB_CMD);
 var ASP_RSL_Unitdata rx;
 [] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr)) -> value rx {
 	setverdict(fail, "Received unexpected RSL ", rx);
@@ -334,7 +334,7 @@
                             template (present) integer expect_blocks := ?)
 return template (present) RSL_Message
 {
-	var template RSL_Message tr;
+	var template (present) RSL_Message tr;
 	var integer len;
 	var integer num_blocks;
 	var octetstring payload;
@@ -407,7 +407,7 @@
 	f_cbsp_write(g_cbsp_msg_id, g_cbsp_ser_no, cell_list, content:=pages,
 		     success_list:=tr_BSSMAP_CIL_CGI({?,?,?}), fail_list:={?});
 
-	var template RSL_Message tr := f_page2rsl(pages[0], g_cbsp_msg_id, g_cbsp_ser_no, expect_blocks := expect_blocks);
+	var template (present) RSL_Message tr := f_page2rsl(pages[0], g_cbsp_msg_id, g_cbsp_ser_no, expect_blocks := expect_blocks);
 	log("RSL[0,1,2] EXPECTING ", tr_ASP_RSL_UD(tr));
 	interleave {
 	[] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr)) { log("Got SMSCB CMD on RSL[0]"); }
@@ -453,7 +453,7 @@
 	f_cbsp_init_server(2001, 2501);
 	f_cbsp_write(g_cbsp_msg_id, g_cbsp_ser_no, cell_list, content:=pages,
 		     success_list:=cell_list, fail_list:=omit);
-	var template RSL_Message tr := f_page2rsl(pages[0], g_cbsp_msg_id, g_cbsp_ser_no);
+	var template (present) RSL_Message tr := f_page2rsl(pages[0], g_cbsp_msg_id, g_cbsp_ser_no);
 	IPA_RSL[0].receive(tr_ASP_RSL_UD(tr));
 	f_sleep(5.0);
 }
@@ -528,7 +528,7 @@
 	f_cbsp_init_server(8001, 8501);
 	f_cbsp_write(g_cbsp_msg_id, g_cbsp_ser_no, cell_list, content:=pages,
 		     success_list:=?, fail_list:=omit);
-	var template RSL_Message tr := f_page2rsl(pages[0], g_cbsp_msg_id, g_cbsp_ser_no);
+	var template (present) RSL_Message tr := f_page2rsl(pages[0], g_cbsp_msg_id, g_cbsp_ser_no);
 	interleave {
 	[] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr));
 	[] IPA_RSL[1].receive(tr_ASP_RSL_UD(tr));

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19749
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: Id64e8e135b690c34293487304d7a175b5b56265b
Gerrit-Change-Number: 19749
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
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/20200821/48b0d46a/attachment.htm>