[S] Change in osmo-ttcn3-hacks[master]: start-testsuite: respect $TTCN3_DIR (if set)

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40128?usp=email ) Change subject: start-testsuite: respect $TTCN3_DIR (if set) ...................................................................... start-testsuite: respect $TTCN3_DIR (if set) Change-Id: I5c1cdc6ffbe50cf7ee48a160d2f406e428326d14 --- M start-testsuite.sh 1 file changed, 12 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/start-testsuite.sh b/start-testsuite.sh index 4f2fba4..7d06bf2 100755 --- a/start-testsuite.sh +++ b/start-testsuite.sh @@ -42,19 +42,22 @@ TEST=$3 fi -# this is an example for using a non-installed custom (e.g. git master) TITAN -#TTCN3_DIR="/home/laforge/projects/git/titan/titan.core/Install" -#export TTCN3_DIR -#TITAN_LIBRARY_PATH="$TTCN3_DIR/lib" -#TTCN3_BIN_DIR="$TTCN3_DIR/bin" - # Limit max num of open file descriptors to workaround titan.core bug: # https://gitlab.eclipse.org/eclipse/titan/titan.core/-/issues/690 ulimit -n 100000 -# below is for the debian packages -TTCN3_BIN_DIR="${TTCN3_BIN_DIR:-/usr/bin}" -TITAN_LIBRARY_PATH="${TITAN_LIBRARY_PATH:-/usr/lib/titan:/usr/ttcn3/lib}" +if [ -z "$TTCN3_DIR" ]; then + # below is for the debian packages + TTCN3_BIN_DIR="${TTCN3_BIN_DIR:-/usr/bin}" + TITAN_LIBRARY_PATH="${TITAN_LIBRARY_PATH:-/usr/lib/titan:/usr/ttcn3/lib}" +else + # below is for Arch Linux packages + # https://aur.archlinux.org/packages/eclipse-titan + # https://aur.archlinux.org/packages/titan-git + # ... and non-installed custom (e.g. git master) builds + TTCN3_BIN_DIR="${TTCN3_DIR}/bin" + TITAN_LIBRARY_PATH="${TTCN3_DIR}/lib" +fi # Run ttcn3_start with LD_LIBRARY_PATH. Do not put $TEST in quotes as it can be # empty and must be omitted in that case. Otherwise ttcn3_start tries to stop -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40128?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5c1cdc6ffbe50cf7ee48a160d2f406e428326d14 Gerrit-Change-Number: 40128 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>