Add a link to the perf dashboard in the test output.

mojo/tools/get_test_list.py

 #!/usr/bin/env python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Central list of tests to run (as appropriate for a given config). Add tests
 to run by modifying this file.
 
 Note that this file is both imported (by mojob.py) and run directly (via a
 recipe)."""
 
 
 import argparse
 import json
 import os
+import subprocess
 import sys
+import urllib
 
 from mopy.config import Config
 from mopy.paths import Paths
 
 
 def GetTestList(config):
   """Gets the list of tests to run for the given config. The test list (which is
-  returned) is just a list of dictionaries, each dictionary having two required
+  returned) is just a list of dictionaries, each dictionary having the following
   fields:
     {
+      # Required:
       "name": "Short name",
       "command": ["python", "test_runner.py", "--some", "args"]
+
+      # Optional:
+      "links": {

[viettrungluu, 2015/01/28 01:51:45]

I'm dubious about this having a dictionary value. Can you really not have
multiple URLs with the same anchor text? Is there no meaningful order?

+        "Anchor text": "URL"
+      }
     }
   """
 
   types_to_run = set(config.test_types)
 
   # See above for a description of the test list.
   test_list = []
 
   paths = Paths(config)
   build_dir = paths.SrcRelPath(paths.build_dir)
   target_os = config.target_os
 
   # Utility functions ----------------------------------------------------------
 
   # Call this to determine if a test matching classes this_tests_types should
   # run: e.g., ShouldRunTest(Config.TEST_TYPE_DEFAULT, "sky") returns true if
   # the test list being requested specifies the default set or the "sky" set.
   def ShouldRunTest(*this_tests_types):
     return not types_to_run.isdisjoint(this_tests_types)
 
   # Call this to add the given command to the test list.
-  def AddEntry(name, command):
+  def AddEntry(name, command, links=None):
     if config.sanitizer == Config.SANITIZER_ASAN:
       command = (['python', os.path.join("mojo", "tools",
                                          "run_command_through_symbolizer.py")] +
                  command)
-    test_list.append({"name": name, "command": command})
+    entry = {"name": name, "command": command}
+    if links is not None:
+      entry["links"] = links
+    test_list.append(entry)
 
   # Call this to add the given command to the test list. If appropriate, the
   # command will be run under xvfb.
-  def AddXvfbEntry(name, command):
+  def AddXvfbEntry(name, command, links=None):

[viettrungluu, 2015/01/28 01:51:45]

Just do **kwargs here.

     real_command = ["python"]
     if config.target_os == Config.OS_LINUX:
       real_command += ["./testing/xvfb.py", paths.SrcRelPath(paths.build_dir)]
     real_command += command
-    AddEntry(name, real_command)
+    AddEntry(name, real_command, links)

[viettrungluu, 2015/01/28 01:51:45]

And here.

+
+  def GetCurrentCommitCount():

[viettrungluu, 2015/01/28 01:51:45]

Please don't do this (actually run outside stuff, or assume that you're even
inside a git checkout for that matter).

Moreover, "git rev-list HEAD --count" isn't necessarily going to a stable or
meaningful number. Also, I don't know what it'd do in a shallow clone for
example.

+    return subprocess.check_output(
+        ["git", "rev-list", "HEAD", "--count"]).strip()
+
 
   # ----------------------------------------------------------------------------
 
   # TODO(vtl): Currently, we only know how to run tests for Android, Linux, or
   # Windows.
   if target_os not in (Config.OS_ANDROID, Config.OS_LINUX, Config.OS_WINDOWS):
     return test_list
 
   # Tests run by default -------------------------------------------------------
 
@@ skipping 49 matching lines @@
     if config.values.get("test_results_server"):
       sky_command += ["--test-results-server",
                       config.values["test_results_server"]]
     AddXvfbEntry("Sky tests", sky_command)
 
   # Perf tests -----------------------------------------------------------------
 
   if target_os == Config.OS_LINUX and ShouldRunTest(Config.TEST_TYPE_PERF):
     perf_id = "linux_%s" % ("debug" if config.is_debug else "release")
     test_names = ["mojo_public_system_perftests"]
+    point_id = GetCurrentCommitCount()
 
     for test_name in test_names:
       command = ["python",
                  os.path.join("mojo", "tools", "perf_test_runner.py"),
                  "--perf-id", perf_id,
                  "--test-name", test_name,
                  "--perf-data-path",
                  os.path.join(build_dir, test_name + "_perf.log"),
+                 "--point-id", point_id,
                  "--production-dashboard"]
       if config.values.get("builder_name"):
         command += ["--builder-name", config.values["builder_name"]]
       if config.values.get("build_number"):
         command += ["--build-number", config.values["build_number"]]
       if config.values.get("master_name"):
         command += ["--master-name", config.values["master_name"]]
       command += [os.path.join(build_dir, test_name)]
 
-      AddEntry(test_name, command)
+      dashboard_params = urllib.urlencode({
+          "masters": config.values.get("master_name"),
+          "bots": perf_id,
+          "tests": test_name,
+          "rev": point_id,
+      })
+      links = {
+        "Results Dashboard": ("https://chromeperf.appspot.com/report?%s"
+                                  % dashboard_params)
+      }
+      AddEntry(test_name, command, links)

[viettrungluu, 2015/01/28 01:51:45]

You should use your kwarg as a kwarg, given that you consider it optional.

 
   # Integration tests ----------------------------------------------------------
 
   if target_os == Config.OS_ANDROID and ShouldRunTest(
       Config.TEST_TYPE_DEFAULT, Config.TEST_TYPE_INTEGRATION):
     AddEntry("Integration test (MojoTest)",
              ["python",
               os.path.join("build", "android", "test_runner.py"),
               "instrumentation",
               "--test-apk=MojoTest",
@@ skipping 41 matching lines @@
   config = Config(**json.load(args.config_file))
   test_list = GetTestList(config)
   json.dump(test_list, args.test_list_file, indent=2)
   args.test_list_file.write("\n")
 
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(main())