Make GOMA_DIR injected from env.

buildbot/buildbot_pnacl_toolchain.py

Index: buildbot/buildbot_pnacl_toolchain.py
diff --git a/buildbot/buildbot_pnacl_toolchain.py b/buildbot/buildbot_pnacl_toolchain.py
index ae1f7aca3fcd2ed97c351ca426fa0f0079fc346b..c7fa9de5c838f66944c547747f4e975e33c95fde 100755
--- a/buildbot/buildbot_pnacl_toolchain.py
+++ b/buildbot/buildbot_pnacl_toolchain.py
@@ -28,8 +28,10 @@ BUILD_DIR = os.path.join(NACL_DIR, 'build')
 PACKAGE_VERSION_DIR = os.path.join(BUILD_DIR, 'package_version')
 PACKAGE_VERSION_SCRIPT = os.path.join(PACKAGE_VERSION_DIR, 'package_version.py')
 
-GOMA_PATH = '/b/build/goma'
+GOMA_DEFAULT_PATH = '/b/build/goma'
+GOMA_PATH = os.environ.get('GOMA_DIR', GOMA_DEFAULT_PATH)
 GOMA_CTL = os.path.join(GOMA_PATH, 'goma_ctl.py')
+start_goma = not os.environ.get('NOSTART_GOMA')

[ukai, 2016/11/10 08:01:07]

this will be used to let goma start/stop in caller (recipe etc) ?

better to have comment or explain in CL description.

maybe, after use_goma= below? 

control_goma = use_goma and not os.environ.get('..

[Yoshisato Yanagisawa, 2016/11/10 08:32:38]

Done.

 
 # As this is a buildbot script, we want verbose logging. Note however, that
 # toolchain_build has its own log settings, controlled by its CLI flags.
@@ -141,7 +143,7 @@ if host_os != 'win':
          os.path.join(
              NACL_DIR, '..', 'tools', 'clang', 'scripts', 'update.py')])
 
-if use_goma:
+if use_goma and start_goma:
   buildbot_lib.Command(context, cmd=[sys.executable, GOMA_CTL, 'restart'])
 
 # toolchain_build outputs its own buildbot annotations, so don't use
@@ -155,7 +157,7 @@ if use_goma:
 # First build only the packages that will be uploaded, and upload them.
 RunWithLog(ToolchainBuildCmd(sync=True, extra_flags=['--canonical-only']))
 
-if use_goma:
+if use_goma and start_goma:
   buildbot_lib.Command(context, cmd=[sys.executable, GOMA_CTL, 'stop'])
 
 if args.skip_tests: