Change in ...osmo-ttcn3-hacks[master]: start-testsuite.sh: do not override LD_LIBRARY_PATH
fixeria has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14374 ) Change subject: start-testsuite.sh: do not override LD_LIBRARY_PATH .. start-testsuite.sh: do not override LD_LIBRARY_PATH The Eclipse titan.core may not only be installed to hard-coded '/usr/lib/titan' patch, but to any other location too. In the later case, one would have to make sure that the custom path is in $LD_LIBRARY_PATH. So we shall not override it. Change-Id: I1ec28e8c3081d5de1bea90a7451791ac8cbbd27c --- M start-testsuite.sh 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/start-testsuite.sh b/start-testsuite.sh index 5740d3d..31bc891 100755 --- a/start-testsuite.sh +++ b/start-testsuite.sh @@ -21,7 +21,8 @@ TEST=$3 fi -LD_LIBRARY_PATH="$SUITE_DIR:/usr/lib/titan:/usr/ttcn3/lib" ttcn3_start $SUITE $CFG $TEST +TITAN_LIBRARY_PATH="/usr/lib/titan:/usr/ttcn3/lib" +LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SUITE_DIR:$TITAN_LIBRARY_PATH" ttcn3_start $SUITE $CFG $TEST expected="$SUITE_DIR/expected-results.xml" if [ ! -f "$expected" ]; then -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14374 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: I1ec28e8c3081d5de1bea90a7451791ac8cbbd27c Gerrit-Change-Number: 14374 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: merged
Change in ...osmo-ttcn3-hacks[master]: start-testsuite.sh: do not override LD_LIBRARY_PATH
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14374 ) Change subject: start-testsuite.sh: do not override LD_LIBRARY_PATH .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14374 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: I1ec28e8c3081d5de1bea90a7451791ac8cbbd27c Gerrit-Change-Number: 14374 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 04 Jun 2019 15:19:00 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: start-testsuite.sh: do not override LD_LIBRARY_PATH
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14374 Change subject: start-testsuite.sh: do not override LD_LIBRARY_PATH .. start-testsuite.sh: do not override LD_LIBRARY_PATH The Eclipse titan.core may not only be installed to hard-coded '/usr/lib/titan' patch, but to any other location too. In the later case, one would have to make sure that the custom path is in $LD_LIBRARY_PATH. So we shall not override it. Change-Id: I1ec28e8c3081d5de1bea90a7451791ac8cbbd27c --- M start-testsuite.sh 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/74/14374/1 diff --git a/start-testsuite.sh b/start-testsuite.sh index 5740d3d..31bc891 100755 --- a/start-testsuite.sh +++ b/start-testsuite.sh @@ -21,7 +21,8 @@ TEST=$3 fi -LD_LIBRARY_PATH="$SUITE_DIR:/usr/lib/titan:/usr/ttcn3/lib" ttcn3_start $SUITE $CFG $TEST +TITAN_LIBRARY_PATH="/usr/lib/titan:/usr/ttcn3/lib" +LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SUITE_DIR:$TITAN_LIBRARY_PATH" ttcn3_start $SUITE $CFG $TEST expected="$SUITE_DIR/expected-results.xml" if [ ! -f "$expected" ]; then -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14374 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: I1ec28e8c3081d5de1bea90a7451791ac8cbbd27c Gerrit-Change-Number: 14374 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
