[tools] Properly handle different GOMA_DIR in gm.py.

tools/dev/gm.py

 #!/usr/bin/env python
 # Copyright 2017 the V8 project authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 """\
 Convenience wrapper for compiling V8 with gn/ninja and running tests.
 Sets up build output directories if they don't exist.
 Produces simulator builds for non-Intel target architectures.
 Uses Goma by default if it is detected (at output directory setup time).
 Expects to be run from the root of a V8 checkout.
@@ skipping 69 matching lines @@
               "test262": "d8",
               "unittests": "unittests",
               "webkit": "d8"}
 
 OUTDIR = "out"
 
 def DetectGoma():
   home_goma = os.path.expanduser("~/goma")
   if os.path.exists(home_goma):
     return home_goma
+  if os.environ.get("GOMA_DIR"):
+    return os.environ.get("GOMA_DIR")
   if os.environ.get("GOMADIR"):
     return os.environ.get("GOMADIR")
   return None
 
 GOMADIR = DetectGoma()
 IS_GOMA_MACHINE = GOMADIR is not None
 
 USE_GOMA = "true" if IS_GOMA_MACHINE else "false"
 BUILD_OPTS = BUILD_OPTS_GOMA if IS_GOMA_MACHINE else BUILD_OPTS_DEFAULT
 
 RELEASE_ARGS_TEMPLATE = """\
 is_component_build = false
 is_debug = false
 %s
 use_goma = {GOMA}
+goma_dir = \"{GOMA_DIR}\"
 v8_enable_backtrace = true
 v8_enable_disassembler = true
 v8_enable_object_print = true
 v8_enable_verify_heap = true
-""".replace("{GOMA}", USE_GOMA)
+""".replace("{GOMA}", USE_GOMA).replace("{GOMA_DIR}", GOMADIR)
 
 DEBUG_ARGS_TEMPLATE = """\
 is_component_build = true
 is_debug = true
 symbol_level = 2
 %s
 use_goma = {GOMA}
+goma_dir = \"{GOMA_DIR}\"
 v8_enable_backtrace = true
 v8_enable_slow_dchecks = true
 v8_optimized_debug = false
-""".replace("{GOMA}", USE_GOMA)
+""".replace("{GOMA}", USE_GOMA).replace("{GOMA_DIR}", GOMADIR)
 
 OPTDEBUG_ARGS_TEMPLATE = """\
 is_component_build = true
 is_debug = true
 symbol_level = 1
 %s
 use_goma = {GOMA}
+goma_dir = \"{GOMA_DIR}\"
 v8_enable_backtrace = true
 v8_enable_verify_heap = true
 v8_optimized_debug = true
-""".replace("{GOMA}", USE_GOMA)
+""".replace("{GOMA}", USE_GOMA).replace("{GOMA_DIR}", GOMADIR)
 
 ARGS_TEMPLATES = {
   "release": RELEASE_ARGS_TEMPLATE,
   "debug": DEBUG_ARGS_TEMPLATE,
   "optdebug": OPTDEBUG_ARGS_TEMPLATE
 }
 
 def PrintHelpAndExit():
   print(__doc__)
   print(HELP)
@@ skipping 218 matching lines @@
     for c in configs:
       return_code += configs[c].RunTests()
   if return_code == 0:
     _Notify('Done!', 'V8 compilation finished successfully.')
   else:
     _Notify('Error!', 'V8 compilation finished with errors.')
   return return_code
 
 if __name__ == "__main__":
   sys.exit(Main(sys.argv))