This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
ninjab3s gerrit-no-reply at lists.osmocom.orgninjab3s has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/25132 ) Change subject: Fix Amarisoft local execution ...................................................................... Fix Amarisoft local execution Passing an asterisk as a string into a local process does not work because it is interpreted as a string. To make this work we have to adress the binaries directly by name instead of using something like 'lteue-*'. Change-Id: I50adcef36694f05613c2c7ce10ad5828290d6e9c --- M src/osmo_gsm_tester/obj/epc_amarisoft.py M src/osmo_gsm_tester/obj/ms_amarisoft.py 2 files changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/32/25132/1 diff --git a/src/osmo_gsm_tester/obj/epc_amarisoft.py b/src/osmo_gsm_tester/obj/epc_amarisoft.py index 1534d87..e2aad4e 100644 --- a/src/osmo_gsm_tester/obj/epc_amarisoft.py +++ b/src/osmo_gsm_tester/obj/epc_amarisoft.py @@ -101,7 +101,7 @@ self.process.launch() def start_locally(self): - binary = self.inst.child('', BINFILE) + binary = self.inst.child('', AmarisoftEPC.BINFILE) env = {} # setting capabilities will later disable use of LD_LIBRARY_PATH from ELF loader -> modify RPATH instead. diff --git a/src/osmo_gsm_tester/obj/ms_amarisoft.py b/src/osmo_gsm_tester/obj/ms_amarisoft.py index 7e0cc13..27be14e 100644 --- a/src/osmo_gsm_tester/obj/ms_amarisoft.py +++ b/src/osmo_gsm_tester/obj/ms_amarisoft.py @@ -180,14 +180,16 @@ # setting capabilities will later disable use of LD_LIBRARY_PATH from ELF loader -> modify RPATH instead. self.log('Setting RPATH for lteue') - util.change_elf_rpath(binary, util.prepend_library_path(self.inst), self.run_dir.new_dir('patchelf')) + util.change_elf_rpath(binary, str(util.prepend_library_path(self.inst)), self.run_dir.new_dir('patchelf')) # We also need to patch the arch-optimized binaries that lteue() will exec() into: - util.change_elf_rpath(self.inst.child('', 'lteue-*'), util.prepend_library_path(self.inst), self.run_dir.new_dir('patchelf2')) + util.change_elf_rpath(self.inst.child('', 'lteue-avx'), str(util.prepend_library_path(self.inst)), self.run_dir.new_dir('patchelf2')) + util.change_elf_rpath(self.inst.child('', 'lteue-avx2'), str(util.prepend_library_path(self.inst)), self.run_dir.new_dir('patchelf2')) # lteue requires CAP_NET_ADMIN to create tunnel devices: ioctl(TUNSETIFF): self.log('Applying CAP_NET_ADMIN capability to lteue') util.setcap_net_admin(binary, self.run_dir.new_dir('setcap_net_admin')) - util.setcap_net_admin(self.inst.child('', 'lteue-*'), self.run_dir.new_dir('setcap_net_admin2')) + util.setcap_net_admin(self.inst.child('', 'lteue-avx'), str(self.run_dir.new_dir('setcap_net_admin2'))) + util.setcap_net_admin(self.inst.child('', 'lteue-avx2'), str(self.run_dir.new_dir('setcap_net_admin2'))) args = (binary, os.path.abspath(self.config_file)) self.dbg(run_dir=self.run_dir, binary=binary, env=env) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/25132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I50adcef36694f05613c2c7ce10ad5828290d6e9c Gerrit-Change-Number: 25132 Gerrit-PatchSet: 1 Gerrit-Owner: ninjab3s <nils.fuerste at softwareradiosystems.com> Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210806/5f2d0329/attachment.htm>