Allow multiple performance values in _OutputPerfForStandaloneGraphing.

chrome/test/functional/perf.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Basic pyauto performance tests.
 
 For tests that need to be run for multiple iterations (e.g., so that average
 and standard deviation values can be reported), the default number of iterations
 run for each of these tests is specified by |_DEFAULT_NUM_ITERATIONS|.
@@ skipping 306 matching lines @@
       os.chmod(graphs_file, 0755)
 
     # Update data file for this particular graph.
     existing_lines = []
     data_file = os.path.join(self._local_perf_dir, graph_name + '-summary.dat')
     if os.path.exists(data_file):
       with open(data_file) as f:
         existing_lines = f.readlines()
     existing_lines = map(eval, map(lambda x: x.strip(), existing_lines))
 
-    seen_key = graph_name + '|' + description
+    seen_key = graph_name
+    # We assume that the first line |existing_lines[0]| is the latest.
     if units_x:
-      points = []
+      new_line = {
+        'rev': revision,
+        'traces': { description: [] }
+      }
       if seen_key in self._seen_graph_lines:
         # We've added points previously for this graph line in the current
         # test execution, so retrieve the original set of points specified in
         # the most recent revision in the data file.
-        points = existing_lines[0]['traces'][description]
+        new_line = existing_lines[0]
+        if not description in new_line['traces']:
+          new_line['traces'][description] = []
       for x_value, y_value in value:
-        points.append([str(x_value), str(y_value)])
-      new_traces = {
-        description: points
+        new_line['traces'][description].append([str(x_value), str(y_value)])
+    else:
+      new_line = {
+        'rev': revision,
+        'traces': { description: [str(value), str(0.0)] }
       }
-    else:
-      new_traces = {
-        description: [str(value), str(0.0)]
-      }
-
-    new_line = {
-      'rev': revision,
-      'traces': new_traces
-    }
 
     if seen_key in self._seen_graph_lines:
       # Update results for the most recent revision.
       existing_lines[0] = new_line
     else:
       # New results for a new revision.
       existing_lines.insert(0, new_line)
       self._seen_graph_lines[seen_key] = True
 
     existing_lines = map(str, existing_lines)
@@ skipping 2302 matching lines @@
     """Identifies the port number to which the server is currently bound.
 
     Returns:
       The numeric port number to which the server is currently bound.
     """
     return self._server.server_address[1]
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()