osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39922?usp=email )
Change subject: testenv: fix OSMO_DEV_MAKE_DIR env var
......................................................................
testenv: fix OSMO_DEV_MAKE_DIR env var
When --autoreconf-in-src-copy was made the default, the make dir name
has been changed to make2 but this variable was not adjusted. Fix it.
Fixes: dacbca96 ("testenv: use --autoreconf-in-src-copy by default")
Change-Id: Ia46ebe1240806995960545afbb34e6533580f209
---
M _testenv/testenv/cmd.py
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
fixeria: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/_testenv/testenv/cmd.py b/_testenv/testenv/cmd.py
index 5e651bd..864b8b9 100644
--- a/_testenv/testenv/cmd.py
+++ b/_testenv/testenv/cmd.py
@@ -45,9 +45,9 @@
env_extra["TESTENV_GIT_DIR"] = testenv.podman_install.git_dir
else:
if testenv.args.podman:
- env_extra["OSMO_DEV_MAKE_DIR"] = os.path.join(testenv.args.cache,
"podman", "make")
+ env_extra["OSMO_DEV_MAKE_DIR"] = os.path.join(testenv.args.cache,
"podman", "make2")
else:
- env_extra["OSMO_DEV_MAKE_DIR"] = os.path.join(testenv.args.cache,
"host", "make")
+ env_extra["OSMO_DEV_MAKE_DIR"] = os.path.join(testenv.args.cache,
"host", "make2")
if testenv.args.kernel == "debian":
env_extra["TESTENV_QEMU_KERNEL"] = "debian"
--
To view, visit
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39922?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: Ia46ebe1240806995960545afbb34e6533580f209
Gerrit-Change-Number: 39922
Gerrit-PatchSet: 3
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>