osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40979?usp=email ) Change subject: testenv: use separate install dir for --asan ...................................................................... testenv: use separate install dir for --asan The --asan flag builds all Osmocom components with address sanitizer enabled. Use a separate install dir from the non-asan version to ensure we don't end up with using non-asan versions. (A separate make dir is already used.) Bump make_dir_version to avoid having markers for already installed binaries / libraries in the make dir, which are invalid now for asan-builds as we switched the install dir. Fixes: c3657172 ("testenv: add run --asan") Change-Id: Ic75452b75d4c3ee8045b68353830b5532e1ce90e --- M _testenv/testenv/cmd.py 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/_testenv/testenv/cmd.py b/_testenv/testenv/cmd.py index 2cc590a..d637129 100644 --- a/_testenv/testenv/cmd.py +++ b/_testenv/testenv/cmd.py @@ -12,7 +12,7 @@ install_dir = None make_dir = None # osmo-dev make dir version, bump when making incompatible changes -make_dir_version = 3 +make_dir_version = 4 def distro_cache_suffix(): @@ -33,6 +33,8 @@ install_dir = "/" else: install_dir = os.path.join(testenv.args.cache, "podman/install") + if testenv.args.asan: + install_dir += "-asan" install_dir += distro_cache_suffix() else: install_dir = os.path.join(testenv.args.cache, "host/install") -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40979?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: Ic75452b75d4c3ee8045b68353830b5532e1ce90e Gerrit-Change-Number: 40979 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>