Pulling back revision 6635 and 6634 due to broken builds.

tests/spec2k/emit_perf_log.sh

 #!/bin/bash
 
 # Copyright (c) 2011 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 set -o nounset
 set -o errexit
 
 #@ LogUserSysTime <time_file> <graph_label> <bench> <compiler_setup>
 #@   Take user+sys data from <time_file>, and log it for the Chrome perf bots.
 #@   <time_file> should be a single line where column 1 and 2 are user/sys.
 LogUserSysTime() {
   local time_file=$1
   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>
 #@   Measure and log size of gzipped executable/bc files/etc.
 LogGzippedSize() {
   local file_to_zip=$1
   local graph_label=$2
   local bench=$3
   local setup=$4
   local tempsize=`gzip ${file_to_zip} -c | wc -c`
@@ skipping 21 matching lines @@
 
 [ $# = 0 ] && set -- help  # Avoid reference to undefined $1.
 
 if [ "$(type -t $1)" != "function" ]; then
   Usage
   echo "ERROR: unknown mode '$1'." >&2
   exit 1
 fi
 
 eval "$@"