Change in osmo-ttcn3-hacks[master]: HACK: avoid compilation error with TITAN > 6.5.0

[laforge]

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

Change subject: HACK: avoid compilation error with TITAN > 6.5.0
......................................................................

HACK: avoid compilation error with TITAN > 6.5.0

it seems TITAN no longer supports 'ifpresent' in certain situations,
see https://www.eclipse.org/forums/index.php/m/1826175/#msg_1826175

Let's make the tests fail if we actually run in those cases, but at
least compile fine and be able to execute all the other tests.

Change-Id: Ia401c2d696979c0062872bca8da62c2ea153427b
---
M library/CBSP_Templates.ttcn
1 file changed, 8 insertions(+), 4 deletions(-)

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



diff --git a/library/CBSP_Templates.ttcn b/library/CBSP_Templates.ttcn
index fe06150..49906fe 100644
--- a/library/CBSP_Templates.ttcn
+++ b/library/CBSP_Templates.ttcn
@@ -368,7 +368,8 @@
 		tr_NewSerNo(new_ser_nr)
 	};
 	if (istemplatekind(cell_list, "*")) {
-		ies[lengthof(ies)] := tr_CbspCellList ifpresent;
+		testcase.stop("TITAN > 6.5.0 doesn't support this");
+		//ies[lengthof(ies)] := tr_CbspCellList ifpresent;
 	} else if (istemplatekind(cell_list, "?")) {
 		ies[lengthof(ies)] := tr_CbspCellList(?);
 	} else if (not istemplatekind(cell_list, "omit")) {
@@ -411,7 +412,8 @@
 		tr_CbspNumComplList(compl_list)
 	};
 	if (istemplatekind(cell_list, "*")) {
-		ies[lengthof(ies)] := tr_CbspCellList ifpresent;
+		testcase.stop("TITAN > 6.5.0 doesn't support this");
+		//ies[lengthof(ies)] := tr_CbspCellList ifpresent;
 	} else if (istemplatekind(cell_list, "?")) {
 		ies[lengthof(ies)] := tr_CbspCellList(?);
 	} else if (not istemplatekind(cell_list, "omit")) {
@@ -464,7 +466,8 @@
 		ies[lengthof(ies)] := tr_CbspNumComplList(compl_list);
 	}
 	if (istemplatekind(cell_list, "*")) {
-		ies[lengthof(ies)] := tr_CbspCellList ifpresent;
+		testcase.stop("TITAN > 6.5.0 doesn't support this");
+		//ies[lengthof(ies)] := tr_CbspCellList ifpresent;
 	} else if (istemplatekind(cell_list, "?")) {
 		ies[lengthof(ies)] := tr_CbspCellList(?);
 	} else if (not istemplatekind(cell_list, "omit")) {
@@ -641,7 +644,8 @@
 		ies[lengthof(ies)] := tr_CbspCellList(cell_list);
 	}
 	if (istemplatekind(channel_ind, "*")) {
-		ies[lengthof(ies)] := tr_CbspChannelInd(?) ifpresent;
+		testcase.stop("TITAN > 6.5.0 doesn't support this");
+		//ies[lengthof(ies)] := tr_CbspChannelInd(?) ifpresent;
 	} else if (not istemplatekind(channel_ind, "omit")) {
 		ies[lengthof(ies)] := tr_CbspChannelInd(channel_ind);
 	}

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17908
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: Ia401c2d696979c0062872bca8da62c2ea153427b
Gerrit-Change-Number: 17908
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200420/11dbe768/attachment.htm>