osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39923?usp=email )
Change subject: sccp: testenv: fix hardcoded sccp_demo_user path ......................................................................
sccp: testenv: fix hardcoded sccp_demo_user path
The current path only worked for with podman and with osmo-dev. Make it work for the following use cases too:
* without podman, with osmo-dev * with podman, with binary packages (instead of osmo-dev)
Removing package=no is required, so testenv build sccp_demo_user from source when running with --binary-packages. This is needed as sccp_demo_user is not packaged (OS#5899).
Change-Id: Id6e0b669dcb71cab9e789fe011e60827a8e07f77 --- A sccp/run_sccp_demo_user.sh M sccp/testenv.cfg 2 files changed, 12 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/23/39923/1
diff --git a/sccp/run_sccp_demo_user.sh b/sccp/run_sccp_demo_user.sh new file mode 100755 index 0000000..88cd507 --- /dev/null +++ b/sccp/run_sccp_demo_user.sh @@ -0,0 +1,11 @@ +#!/bin/sh -ex + +if [ -n "$OSMO_DEV_MAKE_DIR" ]; then + # Using osmo-dev: either with or without --podman + exec "$OSMO_DEV_MAKE_DIR"/libosmo-sigtran/examples/sccp_demo_user "$@" +fi + +# Using binary packages: as sccp_demo_user is not packaged it gets +# built by testenv/podman_install.py:from_source_sccp_demo_user() +# and symlinked to /usr/local/bin. +exec sccp_demo_user "$@" diff --git a/sccp/testenv.cfg b/sccp/testenv.cfg index 44ba8ce..de7b630 100644 --- a/sccp/testenv.cfg +++ b/sccp/testenv.cfg @@ -3,7 +3,6 @@ config=SCCP_Tests.cfg
[sccp_demo_user] -program=~/.cache/osmo-ttcn3-testenv/podman/make/libosmo-sigtran/examples/.libs/sccp_demo_user -l 127.0.0.2 -r 127.0.0.1 -C sccp_demo_user.cfg +program=run_sccp_demo_user.sh -l 127.0.0.2 -r 127.0.0.1 -C sccp_demo_user.cfg make=libosmo-sigtran -package=no copy=sccp_demo_user.cfg