From af3417b69e3b0d90ef4cd36961331979cf4b1469 Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Mon, 6 Jul 2015 08:17:44 -0600 Subject: [PATCH] Add environment for test as well for R on OSX --- dev/buildbot/master/master.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/buildbot/master/master.cfg b/dev/buildbot/master/master.cfg index 88b48d48..4a17a39f 100644 --- a/dev/buildbot/master/master.cfg +++ b/dev/buildbot/master/master.cfg @@ -681,7 +681,7 @@ def cmake_slave(mod_name, platform, gitMode = 'incremental', install = True, cma else: factory.addStep(ShellCommand(command=' '.join(pre+["cmake", "--build", "."]+build_args), workdir = working_folder, haltOnFailure = True)) if test: - factory.addStep(ShellCommand(command=["ctest", "--extra-verbose"] + ctest_args, workdir = working_folder, haltOnFailure = True)) + factory.addStep(ShellCommand(command=["ctest", "--extra-verbose"] + ctest_args, workdir = working_folder, haltOnFailure = True, env = cmake_env)) if install: factory.addStep(DirectoryUpload(slavesrc="install_root",masterdest=masterdestLocation,url="binaries",compress="bz2")) fixPermissions(factory)