From 8c40eda79c77d63623107380ec0bef4676b3bb6a Mon Sep 17 00:00:00 2001 From: Lars Bergstrom Date: Thu, 21 Apr 2016 16:01:43 -0500 Subject: [PATCH] Fix building on Windows --- buildbot/master/files/config/factories.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/buildbot/master/files/config/factories.py b/buildbot/master/files/config/factories.py index 041380d8..439bc7ed 100644 --- a/buildbot/master/files/config/factories.py +++ b/buildbot/master/files/config/factories.py @@ -114,13 +114,20 @@ def make_step(self, command): logEnviron=False), ]) + +def make_cd_string(command): + return "cd /c/buildbot/slave/windows/build ; " + command + + windows = ServoFactory([ # TODO: convert this to use DynamicServoFactory # We need to run each command in a bash login shell, which breaks the # heuristics used by DynamicServoFactory.make_step - steps.Compile(command=["bash", "-l", "-c", "./mach build -d -v"], + steps.Compile(command=["bash", "-l", "-c", + make_cd_string("./mach build -d -v")], env=envs.build_windows), - steps.Compile(command=["bash", "-l", "-c", "./mach test-unit"], + steps.Compile(command=["bash", "-l", "-c", + make_cd_string("./mach test-unit")], env=envs.build_windows), # TODO: run lockfile_changed.sh and manifest_changed.sh scripts ])