[test] Correctly deduce test-driver arguments on bots using GN

tools/run-tests.py

 #!/usr/bin/env python
 #
 # Copyright 2012 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 434 matching lines @@
       gn_config_dir = os.path.join(gn_out_dir, gn_config)
       if not isdir(gn_config_dir):
         continue
       if os.path.getmtime(gn_config_dir) > latest_timestamp:
         latest_timestamp = os.path.getmtime(gn_config_dir)
         latest_config = gn_config
     if latest_config:
       print(">>> Latest GN build found is %s" % latest_config)
       options.outdir = os.path.join(DEFAULT_OUT_GN, latest_config)
 
-  build_config_path = os.path.join(
-      BASE_DIR, options.outdir, "v8_build_config.json")
+  if options.buildbot:
+    build_config_path = os.path.join(
+        BASE_DIR, options.outdir, options.mode, "v8_build_config.json")

[Michael Achenbach, 2016/10/18 14:05:37]

It is a convention on buildbot that the build products are in outdir + mode,
e.g. out/Release.

+  else:
+    build_config_path = os.path.join(
+        BASE_DIR, options.outdir, "v8_build_config.json")
+
   if os.path.exists(build_config_path):
     try:
       with open(build_config_path) as f:
         build_config = json.load(f)
     except Exception:
       print ("%s exists but contains invalid json. Is your build up-to-date?" %
              build_config_path)
       return False
     options.auto_detect = True
 
+    # In auto-detect mode the outdir is always where we found the build config.
+    # This ensures that we'll also take the build products from there.
+    options.outdir = os.path.dirname(build_config_path)
+
     options.arch_and_mode = None
     options.arch = build_config["v8_target_cpu"]
     if options.arch == 'x86':
       # TODO(machenbach): Transform all to x86 eventually.
       options.arch = 'ia32'
     options.asan = build_config["is_asan"]
     options.dcheck_always_on = build_config["dcheck_always_on"]
     options.enable_inspector = build_config["v8_enable_inspector"]
     options.mode = 'debug' if build_config["is_debug"] else 'release'
     options.msan = build_config["is_msan"]
@@ skipping 227 matching lines @@
       return 2
     exit_code = exit_code or code
   return exit_code
 
 
 def Execute(arch, mode, args, options, suites):
   print(">>> Running tests for %s.%s" % (arch, mode))
 
   shell_dir = options.shell_dir
   if not shell_dir:
-    if options.buildbot:
+    if options.auto_detect:
+      # If an output dir with a build was passed, test directly in that
+      # directory.
+      shell_dir = os.path.join(BASE_DIR, options.outdir)
+    elif options.buildbot:

[Michael Achenbach, 2016/10/18 14:05:37]

This remains for gyp bots that don't support auto-detect.

       # TODO(machenbach): Get rid of different output folder location on
       # buildbot. Currently this is capitalized Release and Debug.
       shell_dir = os.path.join(BASE_DIR, options.outdir, mode)
       mode = BuildbotToV8Mode(mode)
-    elif options.auto_detect:
-      # If an output dir with a build was passed, test directly in that
-      # directory.
-      shell_dir = os.path.join(BASE_DIR, options.outdir)
     else:
       shell_dir = os.path.join(
           BASE_DIR,
           options.outdir,
           "%s.%s" % (arch, MODES[mode]["output_folder"]),
       )
   if not os.path.exists(shell_dir):
       raise Exception('Could not find shell_dir: "%s"' % shell_dir)
 
   # Populate context object.
@@ skipping 175 matching lines @@
         "--coverage-dir=%s" % options.sancov_dir])
     except:
       print >> sys.stderr, "Error: Merging sancov files failed."
       exit_code = 1
 
   return exit_code
 
 
 if __name__ == "__main__":
   sys.exit(Main())