Module: check_mk
Branch: master
Commit: 87ab35d0b219d47384515e971685290e037b973f
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87ab35d0b219d4…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Oct 24 16:13:19 2017 +0200
Log chroot path; Hand over chroot vars to test .f12 calls
Change-Id: I8b9a86f8bae5888979ad3e009bd7b11d0abaad05
---
agents/windows/make-agent | 2 ++
tests/testlib/__init__.py | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/agents/windows/make-agent b/agents/windows/make-agent
index b7ea530..8567303 100755
--- a/agents/windows/make-agent
+++ b/agents/windows/make-agent
@@ -42,6 +42,8 @@ fi
CHROOT_BASE_PATH=${CHROOT_BASE_PATH:-$base/$base_rel_dir/chroot}
export CHROOT_PATH=$CHROOT_PATH/$CHROOT_NAME/$CHROOT_VERSION
+echo "CHROOT_PATH is $CHROOT_PATH"
+
# Realize a file based locking for the chroot setup. There must be only
# a single caller executing the setup of a chroot. Once the chroot was
# created, multiple jobs may be executed in the chroot simultaneously,
diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py
index 2ee739d..1feac9b 100644
--- a/tests/testlib/__init__.py
+++ b/tests/testlib/__init__.py
@@ -526,7 +526,9 @@ class Site(object):
print("Executing .f12 in \"%s\"..." % path)
sys.stdout.flush()
assert os.system("cd \"%s\" ; "
- "sudo PATH=$PATH ONLY_COPY=1 ALL_EDITIONS=0 SITE=%s
bash -x .f12" %
+ "sudo PATH=$PATH ONLY_COPY=1 ALL_EDITIONS=0 SITE=%s
"
+ "CHROOT_BASE_PATH=$CHROOT_BASE_PATH
CHROOT_BUILD_DIR=$CHROOT_BUILD_DIR "
+ "bash -x .f12" %
(path, self.id)) >> 8 == 0
print("Executing .f12 in \"%s\" DONE" % path)
sys.stdout.flush()