osmith submitted this change.

View Change



1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.

Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve
testenv: Add $install_dir/usr/bin to $PATH

When building programs from source, don't look only in $install_dir/bin,
but also in $install_dir/usr/bin for the binaries. osmo-s1gw installs to
usr/bin with recent changes and other programs may do this too.

Related: osmo-s1gw I5681ca103daf1c497218b4513b0ca97b1aae03d3
Change-Id: I8d652dba94bbd44217a3034ac012b6568941347d
---
M _testenv/testenv/cmd.py
1 file changed, 1 insertion(+), 0 deletions(-)

diff --git a/_testenv/testenv/cmd.py b/_testenv/testenv/cmd.py
index e8598f0..afe9003 100644
--- a/_testenv/testenv/cmd.py
+++ b/_testenv/testenv/cmd.py
@@ -86,6 +86,7 @@

if install_dir and install_dir != "/":
path += f":{os.path.join(install_dir, 'bin')}"
+ path += f":{os.path.join(install_dir, 'usr/bin')}"

if podman:
path += ":/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"

To view, visit change 40771. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: merged
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I8d652dba94bbd44217a3034ac012b6568941347d
Gerrit-Change-Number: 40771
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>