Pulling back revision 6635 and 6634 due to broken builds.

tests/spec2k/emit_perf_log.sh

Index: tests/spec2k/emit_perf_log.sh
===================================================================
--- tests/spec2k/emit_perf_log.sh	(revision 6635)
+++ tests/spec2k/emit_perf_log.sh	(working copy)
@@ -15,11 +15,11 @@
   local graph_label=$2
   local bench=$3
   local setup=$4
-  # Generate a list of times "[x,y,z]". The chromium perf log parser
-  # will know to average this list of times.
-  local times="[$(awk '{print $1 + $2}' ${time_file} | \
-                   tr '\n' ',' | sed 's/,$//')]"
-  LogPerf ${graph_label} ${bench} ${setup} "${times}" "secs"
+  # Generate a set of times "{x,y,z}". The chromium perf log parser
+  # will know to average this set of times.
+  local time_set="{$(awk '{print $1 + $2}' ${time_file} | \
+                   tr '\n' ',' | sed 's/,$//')}"
+  LogPerf ${graph_label} ${bench} ${setup} "${time_set}" "secs"
 }
 
 #@ LogGzippedSize <file_to_zip> <graph_label> <bench> <compiler_setup>