Attention is currently required from: fixeria.
lynxis lazus has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/libosmocore/+/41362?usp=email )
Change subject: tests/testsuite.at: fix invalid if-endif syntax
......................................................................
Patch Set 1:
(1 comment)
File tests/testsuite.at:
https://gerrit.osmocom.org/c/libosmocore/+/41362/comment/74538698_b27baf09?… :
PS1, Line 86: AT_SKIP_IF([test ! -e $abs_top_builddir/tests/msgfile/msgfile_test])
> @pespin@sysmocom.de if you grep for `ENABLE_URING`, for instance: […]
I would like in general spent more time on a different build system, than trying to debug the current one. Spent already so much time again in this one. (not related to this commit, but to sigtran build system problems).
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41362?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: I81e044dc0bda4674c0d0dc46118d46816712a76c
Gerrit-Change-Number: 41362
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 06 Nov 2025 18:18:11 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu>
pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41304?usp=email )
Change subject: Revert "epdg: add sleep to f_TC_hss_initiated_deregister_permanent_termination"
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
I plan to merge this one tomorrow, after the osmo-epdg patches are for sure being incorporated when running the ttcn3 testsuite.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41304?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I900394cb02c1ff7ea85aaba6ef29a64fd84f679c
Gerrit-Change-Number: 41304
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 06 Nov 2025 17:24:09 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Attention is currently required from: fixeria.
pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/libosmocore/+/41363?usp=email )
Change subject: tests/testsuite.at: use AT_SKIP_IF for sim_test
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41363?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: Ic90b3a39936888eda6c9d443420c4faa131ac78f
Gerrit-Change-Number: 41363
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 06 Nov 2025 15:45:26 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41372?usp=email )
Change subject: hlr: testenv: fix running pyhss from debian pkg
......................................................................
hlr: testenv: fix running pyhss from debian pkg
Move the run_in_venv.sh script that is only used by pyhss from the
generic location _testenv/data/scripts/run_in_venv.sh to
hlr/pyhss/run_in_venv.sh and hardcode the path
/opt/venvs/pyhss/bin/activate in there when running from binary
packages. This is the path used in the binary package in the Osmocom
OBS, the default path from dh_virtualenv. The package doesn't install
pyhss_gsup etc. to /usr/bin, as these are usually not meant to be
directly started without the systemd services that have the
/opt/venvs/pyhss path hardcoded.
Also put 'export PYHSS_CONFIG=config.yaml' in there, now that
the script is pyhss specific.
Related: https://dh-virtualenv.readthedocs.io/en/1.2.1/usage.html
Change-Id: I0cdf1a9f220ddd2ef0866d0d11d1e3f6056a1cba
---
D _testenv/data/scripts/run_in_venv.sh
A hlr/pyhss/run_in_venv.sh
M hlr/testenv_pyhss.cfg
3 files changed, 15 insertions(+), 9 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/72/41372/1
diff --git a/_testenv/data/scripts/run_in_venv.sh b/_testenv/data/scripts/run_in_venv.sh
deleted file mode 100755
index b953a36..0000000
--- a/_testenv/data/scripts/run_in_venv.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh -e
-if [ -n "$TESTENV_INSTALL_DIR" ]; then
- . "$TESTENV_INSTALL_DIR"/venv/bin/activate
-fi
-
-"$@"
diff --git a/hlr/pyhss/run_in_venv.sh b/hlr/pyhss/run_in_venv.sh
new file mode 100755
index 0000000..a145a7d
--- /dev/null
+++ b/hlr/pyhss/run_in_venv.sh
@@ -0,0 +1,12 @@
+#!/bin/sh -e
+export PYHSS_CONFIG=config.yaml
+
+if [ "$TESTENV_INSTALL_DIR" = "/" ]; then
+ # Installed via debian package
+ . /opt/venvs/pyhss/bin/activate
+else
+ # Built with osmo-dev
+ . "$TESTENV_INSTALL_DIR"/venv/bin/activate
+fi
+
+"$@"
diff --git a/hlr/testenv_pyhss.cfg b/hlr/testenv_pyhss.cfg
index 4666d2d..9e9d430 100644
--- a/hlr/testenv_pyhss.cfg
+++ b/hlr/testenv_pyhss.cfg
@@ -5,14 +5,14 @@
copy=pyhss/HLR_Tests.cfg
[pyhss_gsup]
-program=PYHSS_CONFIG=config.yaml run_in_venv.sh pyhss_gsup
+program=./run_in_venv.sh pyhss_gsup
setup=wait_for_port.py -p 4222
make=pyhss
package=pyhss
-copy=pyhss/config.yaml
+copy=pyhss/config.yaml pyhss/run_in_venv.sh
[pyhss_api]
-program=cd ../pyhss_gsup && PYHSS_CONFIG=config.yaml run_in_venv.sh pyhss_api
+program=cd ../pyhss_gsup && ./run_in_venv.sh pyhss_api
setup=./setup_db.sh
make=pyhss
package=pyhss
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41372?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: I0cdf1a9f220ddd2ef0866d0d11d1e3f6056a1cba
Gerrit-Change-Number: 41372
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Attention is currently required from: lynxis lazus, pespin.
fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/libosmocore/+/41362?usp=email )
Change subject: tests/testsuite.at: fix invalid if-endif syntax
......................................................................
Patch Set 1:
(1 comment)
File tests/testsuite.at:
https://gerrit.osmocom.org/c/libosmocore/+/41362/comment/2d0fb0c4_e2314df4?… :
PS1, Line 86: AT_SKIP_IF([test ! -e $abs_top_builddir/tests/msgfile/msgfile_test])
> We seem to be already supporting this with a variable, see libosmocore/tests/testsuite.at: […]
@pespin@sysmocom.de if you grep for `ENABLE_URING`, for instance:
```
$ git grep -n ENABLE_URING tests/
tests/Makefile.am:765: $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) ENABLE_URING=$(ENABLE_URING) ENABLE_URING_TESTS=$(ENABLE_URING_TESTS)
tests/Makefile.am:770: $(TESTSUITEFLAGS) ENABLE_URING=$(ENABLE_URING) ENABLE_URING_TESTS=$(ENABLE_URING_TESTS)
tests/testsuite.at:564:AT_SKIP_IF([ test "$ENABLE_URING" != "yes" || test "$ENABLE_URING_TESTS" != "yes" ])
```
you'll see that these two variables are manually passed to the testsuite script.
```
763 check-local: atconfig $(TESTSUITE)
764 [ -e /proc/cpuinfo ] && cat /proc/cpuinfo
765 $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) ENABLE_URING=$(ENABLE_URING) ENABLE_URING_TESTS=$(ENABLE_URING_TESTS)
766 $(MAKE) $(AM_MAKEFLAGS) ext-tests
767
768 installcheck-local: atconfig $(TESTSUITE)
769 $(SHELL) '$(TESTSUITE)' AUTOTEST_PATH='$(bindir)' \
770 $(TESTSUITEFLAGS) ENABLE_URING=$(ENABLE_URING) ENABLE_URING_TESTS=$(ENABLE_URING_TESTS)
```
This means we would need to pass `ENABLE_MSGFILE` (and the other `ENABLE_` variables) manually. IMO, checking if a binary is present is a lot simpler and less error-prone.
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41362?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: I81e044dc0bda4674c0d0dc46118d46816712a76c
Gerrit-Change-Number: 41362
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Comment-Date: Thu, 06 Nov 2025 15:36:38 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu>
Attention is currently required from: fixeria.
pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/libosmocore/+/41363?usp=email )
Change subject: tests/testsuite.at: use AT_SKIP_IF for sim_test
......................................................................
Patch Set 1:
(1 comment)
File tests/testsuite.at:
https://gerrit.osmocom.org/c/libosmocore/+/41363/comment/c83edc9f_c7a74ac0?… :
PS1, Line 320: AT_SKIP_IF([test ! -e $abs_top_builddir/tests/sim/sim_test])
AFAIU this would also be done with:
AT_SKIP_IF([ test "$ENABLE_PCSC" != "yes" ])
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41363?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: Ic90b3a39936888eda6c9d443420c4faa131ac78f
Gerrit-Change-Number: 41363
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 06 Nov 2025 15:19:28 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No