bench_graph_svg: generate output in consistently sorted order, to make diffs more useful

TBR=benchen
Review URL: https://codereview.appspot.com/7330044

git-svn-id: http://skia.googlecode.com/svn/trunk@7744 2bbb7eff-a529-9590-31e7-b0007b416f81

bench/bench_graph_svg.py

@@ -187,7 +187,7 @@ def redirect_stdout(output_path):
 def create_lines(revision_data_points, settings
                , bench_of_interest, config_of_interest, time_of_interest
                , time_to_ignore):
-    """Convert revision data into sorted line data.
+    """Convert revision data into a dictionary of line data.
     
     ({int:[BenchDataPoints]}, {str:str}, str?, str?, str?)
         -> {Label:[(x,y)] | [n].x <= [n+1].x}"""
@@ -890,8 +890,16 @@ def output_svg(lines, regressions, requested_width, requested_height):
         }
     }
 //]]></script>"""
+
+    # Add a new element to each item in the 'lines' list: the label in string
+    # form.  Then use that element to sort the list.
+    sorted_lines = []
     for label, line in lines.items():
-        print '<g id=%s>' % qa(label)
+        sorted_lines.append([str(label), label, line])
+    sorted_lines.sort()
+
+    for label_as_string, label, line in sorted_lines:
+        print '<g id=%s>' % qa(label_as_string)
         r = 128
         g = 128
         b = 128

tools/tests/run.sh

@@ -116,12 +116,6 @@ function benchgraph_test {
   compare_directories $EXPECTED_OUTPUT_DIR $ACTUAL_OUTPUT_DIR
 }
 
-# TODO(epoger): Temporarily disabled because it was failing on the
-# housekeeper bot; see
-# http://70.32.156.53:10117/builders/Skia_PerCommit_House_Keeping/builds/2081/steps/RunToolSelfTests/logs/stdio
-# It looks like maybe the housekeeper bot is outputting the lines of the file
-# in a different order?
-#
-# benchgraph_test Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_32
+benchgraph_test Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_32
 
 echo "All tests passed."