Teach benchmark runner to understand generic traces.

tools/unittests/run_benchmarks_test.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 from collections import namedtuple
 import coverage
 import json
 from mock import DEFAULT
 from mock import MagicMock
@@ skipping 50 matching lines @@
      "main": "run.js",
      "flags": ["--flag2"],
      "results_regexp": "^DeltaBlue: (.+)$"},
     {"name": "ShouldntRun",
      "path": ["."],
      "archs": ["arm"],
      "main": "run.js"},
   ]
 }
 
+V8_GENERIC_JSON = {
+  "path": ["."],
+  "binary": "cc",
+  "flags": ["--flag"],
+  "generic": True,
+  "run_count": 1,
+  "units": "ms",
+}
+
 Output = namedtuple("Output", "stdout, stderr")
 
 class BenchmarksTest(unittest.TestCase):
   @classmethod
   def setUpClass(cls):
     cls.base = path.dirname(path.dirname(path.abspath(__file__)))
     sys.path.append(cls.base)
     cls._cov = coverage.coverage(
         include=([os.path.join(cls.base, "run_benchmarks.py")]))
     cls._cov.start()
@@ skipping 207 matching lines @@
     self._WriteTestInput(V8_JSON)
     self._MockCommand(["."], ["x\nRichaards: 1.234\nDeltaBlue: 10657567\ny\n"])
     self.assertEquals(1, self._CallMain())
     self._VerifyResults("test", "score", [
       {"name": "Richards", "results": [], "stddev": ""},
       {"name": "DeltaBlue", "results": ["10657567"], "stddev": ""},
     ])
     self._VerifyErrors(
         ["Regexp \"^Richards: (.+)$\" didn't match for benchmark Richards."])
     self._VerifyMock(path.join("out", "x64.release", "d7"), "--flag", "run.js")
+
+  def testOneRunGeneric(self):
+    test_input = dict(V8_GENERIC_JSON)
+    self._WriteTestInput(test_input)
+    self._MockCommand(["."], [
+      "Trace(Test1), Result(1.234), StdDev(0.23)\n"
+      "Trace(Test2), Result(10657567), StdDev(106)\n"])
+    self.assertEquals(0, self._CallMain())
+    self._VerifyResults("test", "ms", [
+      {"name": "Test1", "results": ["1.234"], "stddev": "0.23"},
+      {"name": "Test2", "results": ["10657567"], "stddev": "106"},
+    ])
+    self._VerifyErrors([])
+    self._VerifyMock(path.join("out", "x64.release", "cc"), "--flag", "")