laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/40014?usp=email )
Change subject: Abort configure run on big endian hosts
......................................................................
Abort configure run on big endian hosts
Change-Id: I9bf16113acbbc1e100fd928446a91b927d3c6cbc
---
M configure.ac
1 file changed, 5 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
diff --git a/configure.ac b/configure.ac
index 7863624..c8b2f1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,6 +66,11 @@
AC_SUBST(LTLDFLAGS_OSMOCORE)
AC_SUBST(LTLDFLAGS_OSMOCTRL)
+AC_C_BIGENDIAN(
+ [AC_MSG_ERROR([Unfortunately, big endian hosts are currently not supported anymore due to lack of development resources. Contributions welcome.])],
+ [],
+ [AC_MSG_WARN([Byte order could not be determined. Strange.])])
+
dnl checks for header files
AC_HEADER_STDC
AC_CHECK_HEADERS(execinfo.h poll.h sys/select.h sys/socket.h sys/signalfd.h sys/eventfd.h sys/timerfd.h syslog.h ctype.h netinet/tcp.h netinet/in.h)
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40014?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I9bf16113acbbc1e100fd928446a91b927d3c6cbc
Gerrit-Change-Number: 40014
Gerrit-PatchSet: 2
Gerrit-Owner: Alexander Huemer <alexander.huemer(a)xx.vu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40040?usp=email )
Change subject: testenv: run: add --bisect argument
......................................................................
testenv: run: add --bisect argument
Add an argument that lets testenv.py exit with != 0 when at least one
test has failed, so it can be used with "git bisect".
Change-Id: I941064c1c704560e0f7351c82e810481cd72b6da
---
M _testenv/testenv/__init__.py
M _testenv/testenv/testsuite.py
2 files changed, 11 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/40/40040/1
diff --git a/_testenv/testenv/__init__.py b/_testenv/testenv/__init__.py
index 015ef24..07880cc 100644
--- a/_testenv/testenv/__init__.py
+++ b/_testenv/testenv/__init__.py
@@ -95,7 +95,14 @@
help="use binary packages from this Osmocom OBS project instead (e.g. osmocom:nightly)",
)
- group = sub_run.add_argument_group("loop options", "Run the testsuite / a single test multiple times.")
+ group = sub_run.add_argument_group("exit options", "When and how testenv should exit when done.")
+ group = group.add_mutually_exclusive_group()
+ group.add_argument(
+ "-B",
+ "--bisect",
+ action="store_true",
+ help="exit with != 0 if at least one test failed (use with git bisect)",
+ )
group.add_argument(
"-u",
"--until-nok",
diff --git a/_testenv/testenv/testsuite.py b/_testenv/testenv/testsuite.py
index a6929f0..d7e4b6c 100644
--- a/_testenv/testenv/testsuite.py
+++ b/_testenv/testenv/testsuite.py
@@ -229,6 +229,9 @@
merge_log_files(cfg)
format_log_files(cfg)
+ if testenv.args.bisect and not check_testsuite_successful():
+ raise testenv.NoTraceException("Testsuite failed!")
+
def get_current_test():
path = os.path.join(testenv.testdir.testdir, "testsuite/.current_test")
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40040?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I941064c1c704560e0f7351c82e810481cd72b6da
Gerrit-Change-Number: 40040
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40039?usp=email )
Change subject: testenv: refactor run --until-nok code
......................................................................
testenv: refactor run --until-nok code
Refactor the code in preparation for using the code that checks if the
testsuite was successful with a new --bisect arg in the next patch.
Change-Id: I3a8fc83c6833f0d2a8be9c0d7ddaea0546859988
---
M _testenv/testenv.py
M _testenv/testenv/testsuite.py
2 files changed, 22 insertions(+), 15 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/39/40039/1
diff --git a/_testenv/testenv.py b/_testenv/testenv.py
index b9de4e8..f852c0c 100755
--- a/_testenv/testenv.py
+++ b/_testenv/testenv.py
@@ -19,17 +19,14 @@
def loop_continue_cond(loop_count):
if loop_count == 0:
return True
-
- if testenv.args.until_nok:
- logging.info("Checking testsuite logs for failures and errors")
- for match_str in ["failures='0'", "errors='0'"]:
- if not testenv.testsuite.check_junit_logs_have(loop_count - 1, match_str):
- logging.critical("Stopping the loop")
- return False
- return True
- else:
+ if not testenv.args.until_nok:
return False
+ if not testenv.testsuite.check_testsuite_successful(loop_count - 1):
+ logging.critical("Stopping the loop")
+ return False
+ return True
+
def run():
testenv.testenv_cfg.init()
diff --git a/_testenv/testenv/testsuite.py b/_testenv/testenv/testsuite.py
index 9b28668..a6929f0 100644
--- a/_testenv/testenv/testsuite.py
+++ b/_testenv/testenv/testsuite.py
@@ -156,13 +156,23 @@
testenv.cmd.run(cmd)
-def check_junit_logs_have(loop_count, match_str):
- topdir = os.path.join(testenv.testdir.testdir_topdir, f"loop-{loop_count}")
+def check_testsuite_successful(loop_count=None):
+ topdir = testenv.testdir.testdir_topdir
+ if loop_count is not None:
+ topdir = os.path.join(topdir, f"loop-{loop_count}")
+
+ ret = True
+
for path in get_junit_logs(topdir):
- cmd = ["grep", "-q", match_str, path]
- if testenv.cmd.run(cmd, check=False).returncode:
- return False
- return True
+ for match_str in ["failures='0'", "errors='0'"]:
+ cmd = ["grep", "-q", match_str, path]
+ if testenv.cmd.run(cmd, check=False).returncode:
+ ret = False
+ break
+ if not ret:
+ break
+
+ return ret
def run(cfg):
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40039?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I3a8fc83c6833f0d2a8be9c0d7ddaea0546859988
Gerrit-Change-Number: 40039
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40038?usp=email )
Change subject: Revert "hnbgw: Test paging with PAge Area ID IE"
......................................................................
Revert "hnbgw: Test paging with PAge Area ID IE"
This reverts commit b0e3627eaa2665a03eb2301b099da6bceb4e4d4a: caused
regression in several other tests.
Related: OS#6762
Change-Id: I416d514e739cc0b16832192bfdb746a4ed09336f
---
M hnbgw/HNBGW_Tests.ttcn
M hnbgw/expected-results.xml
M library/ranap/RANAP_Templates.ttcn
3 files changed, 2 insertions(+), 170 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/38/40038/1
diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn
index e18cff1..33800f3 100644
--- a/hnbgw/HNBGW_Tests.ttcn
+++ b/hnbgw/HNBGW_Tests.ttcn
@@ -2184,108 +2184,6 @@
f_shutdown_helper();
}
-/* Make sure that whichever MSC paged a subscriber will also get the Paging Response. Page by IMSI, which would be
- * round-robined to another MSC, to make sure the Paging->Response relation is stronger than the NRI->MSC mapping. */
-friend function f_tc_mscpool_paging_imsi_lai_registered(charstring id) runs on ConnHdlr {
- var hexstring imsi := '001010000000123'H;
- var RANAP_IEs.CN_DomainIndicator domain_ind;
- var template (value) RANAP_IEs.LAI lai := ts_RANAP_LAI(hex2oct(g_pars.hnb.lai.mcc_mnc),
- int2oct(g_pars.hnb.lai.lac, 2));
- var template (value) RANAP_IEs.PagingAreaID pag_area_id := ts_RANAP_PagingAreaID_LAI(lai);
- if (g_pars.ps_domain) {
- domain_ind := ps_domain;
- } else {
- domain_ind := cs_domain;
- }
- var template (value) RANAP_PDU paging := ts_RANAP_Paging_pag_area_id(domain_ind, imsi_hex2oct(imsi), pag_area_id);
- BSSAP.send(ts_RANAP_UNITDATA_req(g_pars.sccp_addr_hnbgw, g_pars.sccp_addr_msc, paging));
- /* TODO: Expect RUA ConnectionlessTransfer Paging (on subset of HNB).
- * We could verify the Paging sent from osmo-hnbgw to RUA with some effort,
- * but, this test does not care whether the Paging was forwarded to RUA or not, only that osmo-hnbgw *received*
- * the Paging. In the CN pool decisions, osmo-hnbgw should match up Paging Response to an earlier Paging.
- */
-
- f_sleep(1.0);
-
- /* Despite the round robin pointing at the second MSC ('roundrobin next msc 1'), the earlier Paging for the same IMSI
- * causes this Paging Response to go to the first MSC ('msc 0'). */
- f_perform_compl_l3(f_gen_one_compl_l3(PAGRESP, ts_MI_IMSI_LV(imsi)));
- f_sleep(1.0);
-}
-
-/* Test CN sending a RANAP Paging Command with Paging Area ID IE (LAI) present requesting a registered HNB: */
-testcase TC_mscpool_paging_imsi_lai_registered() runs on test_CT {
- f_init(nr_msc := 3);
- f_sleep(1.0);
-
- var boolean ps_domain := false;
-
- /* Testing a Paging on the first MSC to get a Paging Response back to the first MSC. Set round robin to the
- * second MSC to make sure we're getting the Paging logic, not a coincidental round robin match. */
- f_vty_set_roundrobin_next(HNBGWVTY, ps_domain, 0);
-
- f_ctrs_cn_init(ps_domain := ps_domain);
-
- var ConnHdlr vc_conn1;
- var template (value) TestHdlrParams pars1 := f_TestHdlrParams(0, ps_domain := ps_domain, cn_nr := 0);
- vc_conn1 := f_start_handler_with_pars(refers(f_tc_mscpool_paging_imsi_lai_registered), pars1);
- vc_conn1.done;
- f_ctrs_cn_expect(0, "cnpool:subscr:paged");
- f_shutdown_helper();
-}
-
-/* Make sure that whichever MSC paged a subscriber will also get the Paging Response. Page by IMSI, which would be
- * round-robined to another MSC, to make sure the Paging->Response relation is stronger than the NRI->MSC mapping. */
-friend function f_tc_mscpool_paging_imsi_rai_registered(charstring id) runs on ConnHdlr {
- var hexstring imsi := '001010000000123'H;
- var RANAP_IEs.CN_DomainIndicator domain_ind;
- var template (value) RANAP_IEs.LAI lai := ts_RANAP_LAI(hex2oct(g_pars.hnb.lai.mcc_mnc),
- int2oct(g_pars.hnb.lai.lac, 2));
- var template (value) RANAP_IEs.RAI rai := ts_RANAP_RAI(lai,
- int2oct(g_pars.hnb.rac, 1));
- var template (value) RANAP_IEs.PagingAreaID pag_area_id := ts_RANAP_PagingAreaID_RAI(rai);
- if (g_pars.ps_domain) {
- domain_ind := ps_domain;
- } else {
- domain_ind := cs_domain;
- }
- var template (value) RANAP_PDU paging := ts_RANAP_Paging_pag_area_id(domain_ind, imsi_hex2oct(imsi), pag_area_id);
- BSSAP.send(ts_RANAP_UNITDATA_req(g_pars.sccp_addr_hnbgw, g_pars.sccp_addr_msc, paging));
- /* TODO: Expect RUA ConnectionlessTransfer Paging (on subset of HNB).
- * We could verify the Paging sent from osmo-hnbgw to RUA with some effort,
- * but, this test does not care whether the Paging was forwarded to RUA or not, only that osmo-hnbgw *received*
- * the Paging. In the CN pool decisions, osmo-hnbgw should match up Paging Response to an earlier Paging.
- */
-
- f_sleep(1.0);
-
- /* Despite the round robin pointing at the second MSC ('roundrobin next msc 1'), the earlier Paging for the same IMSI
- * causes this Paging Response to go to the first MSC ('msc 0'). */
- f_perform_compl_l3(f_gen_one_compl_l3(PAGRESP, ts_MI_IMSI_LV(imsi)));
- f_sleep(1.0);
-}
-
-/* Test CN sending a RANAP Paging Command with Paging Area ID IE (LAI) present requesting a registered HNB: */
-testcase TC_mscpool_paging_imsi_rai_registered() runs on test_CT {
- f_init(nr_msc := 3);
- f_sleep(1.0);
-
- var boolean ps_domain := true;
-
- /* Testing a Paging on the first MSC to get a Paging Response back to the first MSC. Set round robin to the
- * second MSC to make sure we're getting the Paging logic, not a coincidental round robin match. */
- f_vty_set_roundrobin_next(HNBGWVTY, ps_domain, 0);
-
- f_ctrs_cn_init(ps_domain := ps_domain);
-
- var ConnHdlr vc_conn1;
- var template (value) TestHdlrParams pars1 := f_TestHdlrParams(0, ps_domain := ps_domain, cn_nr := 0);
- vc_conn1 := f_start_handler_with_pars(refers(f_tc_mscpool_paging_imsi_rai_registered), pars1);
- vc_conn1.done;
- f_ctrs_cn_expect(0, "cnpool:subscr:paged");
- f_shutdown_helper();
-}
-
/* For round-robin, skip a CN link that has 'no allow-attach' set. */
testcase TC_mscpool_no_allow_attach_round_robin() runs on test_CT {
@@ -2602,8 +2500,6 @@
execute( TC_mscpool_LU_by_tmsi_from_other_PLMN() );
execute( TC_mscpool_paging_imsi() );
execute( TC_mscpool_paging_tmsi() );
- execute( TC_mscpool_paging_imsi_lai_registered() );
- execute( TC_mscpool_paging_imsi_rai_registered() );
execute( TC_mscpool_no_allow_attach_round_robin() );
execute( TC_mscpool_no_allow_attach_valid_nri() );
execute( TC_mscpool_sccp_n_pcstate_detaches_cnlink() );
diff --git a/hnbgw/expected-results.xml b/hnbgw/expected-results.xml
index 3fca542..655db84 100644
--- a/hnbgw/expected-results.xml
+++ b/hnbgw/expected-results.xml
@@ -43,8 +43,6 @@
<testcase classname='HNBGW_Tests' name='TC_mscpool_LU_by_tmsi_from_other_PLMN' time='MASKED'/>
<testcase classname='HNBGW_Tests' name='TC_mscpool_paging_imsi' time='MASKED'/>
<testcase classname='HNBGW_Tests' name='TC_mscpool_paging_tmsi' time='MASKED'/>
- <testcase classname='HNBGW_Tests' name='TC_mscpool_paging_imsi_lai_registered' time='MASKED'/>
- <testcase classname='HNBGW_Tests' name='TC_mscpool_paging_imsi_rai_registered' time='MASKED'/>
<testcase classname='HNBGW_Tests' name='TC_mscpool_no_allow_attach_round_robin' time='MASKED'/>
<testcase classname='HNBGW_Tests' name='TC_mscpool_no_allow_attach_valid_nri' time='MASKED'/>
<testcase classname='HNBGW_Tests' name='TC_mscpool_sccp_n_pcstate_detaches_cnlink' time='MASKED'/>
diff --git a/library/ranap/RANAP_Templates.ttcn b/library/ranap/RANAP_Templates.ttcn
index c328171..b09d23e 100644
--- a/library/ranap/RANAP_Templates.ttcn
+++ b/library/ranap/RANAP_Templates.ttcn
@@ -760,8 +760,7 @@
*****************************************************************************************************/
template (value) RANAP_PDU
-ts_RANAP_Paging(template (value) CN_DomainIndicator dom,
- template (value) IMSI imsi,
+ts_RANAP_Paging(template (value) CN_DomainIndicator dom, template (value) IMSI imsi,
template (omit) Paging.protocolExtensions exts := omit) := {
initiatingMessage := {
procedureCode := id_Paging,
@@ -791,8 +790,7 @@
}
}
template RANAP_PDU
-tr_RANAP_Paging(template (present) CN_DomainIndicator dom,
- template (present) IMSI imsi,
+tr_RANAP_Paging(template CN_DomainIndicator dom, template IMSI imsi,
template Paging.protocolExtensions exts := *) := {
initiatingMessage := {
procedureCode := id_Paging,
@@ -822,7 +820,6 @@
}
}
-
template (value) TemporaryUE_ID ts_RANAP_TemporaryUE_ID_TMSI(octetstring tmsi) := {
tMSI := tmsi
}
@@ -865,65 +862,6 @@
}
}
-template (value) LAI ts_RANAP_LAI(template (value) OCT3 pLMNidentity,
- template (value) OCT2 lac) := {
- pLMNidentity := pLMNidentity,
- lAC := lac,
- iE_Extensions := omit
-};
-
-template (value) RAI ts_RANAP_RAI(template (value) LAI lai,
- template (value) OCT1 rac) := {
- lAI := lai,
- rAC := rac,
- iE_Extensions := omit
-};
-
-template (value) PagingAreaID ts_RANAP_PagingAreaID_LAI(template (value) LAI lai) := {
- lAI := lai
-};
-
-template (value) PagingAreaID ts_RANAP_PagingAreaID_RAI(template (value) RAI rai) := {
- rAI := rai
-};
-
-template (value) RANAP_PDU
-ts_RANAP_Paging_pag_area_id(template (value) CN_DomainIndicator dom, template (value) IMSI imsi,
- template (value) PagingAreaID pag_area_id,
- template (omit) Paging.protocolExtensions exts := omit) := {
- initiatingMessage := {
- procedureCode := id_Paging,
- criticality := ignore,
- value_ := {
- paging := {
- protocolIEs := {
- {
- id := id_CN_DomainIndicator,
- criticality := ignore,
- value_ := {
- cN_DomainIndicator := dom
- }
- }, {
- id := id_PermanentNAS_UE_ID,
- criticality := ignore,
- value_ := {
- permanentNAS_UE_ID := {
- iMSI := imsi
- }
- }
- }, {
- id := id_PagingAreaID,
- criticality := ignore,
- value_ := {
- pagingAreaID := pag_area_id
- }
- }
- },
- protocolExtensions := exts
- }
- }
- }
-}
/*****************************************************************************************************
* Common ID
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40038?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I416d514e739cc0b16832192bfdb746a4ed09336f
Gerrit-Change-Number: 40038
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/40036?usp=email )
Change subject: OBS: build_binpkg: use signed-by in sources.list
......................................................................
Patch Set 1: Verified+1
(1 comment)
Patchset:
PS1:
verified that building debian 10 packages also still works with this
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40036?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I88164d8d106ff2656efbf78e9d3e4031edd9cf45
Gerrit-Change-Number: 40036
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 15 Apr 2025 08:58:53 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Attention is currently required from: Alexander Huemer, laforge.
fixeria has posted comments on this change by Alexander Huemer. ( https://gerrit.osmocom.org/c/libosmocore/+/40014?usp=email )
Change subject: Abort configure run on big endian hosts
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40014?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I9bf16113acbbc1e100fd928446a91b927d3c6cbc
Gerrit-Change-Number: 40014
Gerrit-PatchSet: 2
Gerrit-Owner: Alexander Huemer <alexander.huemer(a)xx.vu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: Alexander Huemer <alexander.huemer(a)xx.vu>
Gerrit-Comment-Date: Tue, 15 Apr 2025 07:57:36 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes