Telemetry & Android: fix stderr / stdout getting mixed.

build/android/pylib/perf_tests_helper.py

 # 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.
 
 import re
 
 import android_commands
 import json
 import math
 
@@ skipping 105 matching lines @@
         _EscapePerfResult(measurement),
         value)
     avg, sd = GeomMeanAndStdDevFromHistogram(value)
 
   if avg:
     output += '\nAvg %s: %f%s' % (measurement, avg, units)
   if sd:
     output += '\nSd  %s: %f%s' % (measurement, sd, units)
   if print_to_stdout:
     print output
+    import sys

[bulach, 2013/01/16 17:23:26]

probably more common to import in the header as usual?

[marja, 2013/01/16 17:25:26]

Done.

+    sys.stdout.flush()
   return output
 
 
 class PerfTestSetup(object):
   """Provides methods for setting up a device for perf testing."""
   _DROP_CACHES = '/proc/sys/vm/drop_caches'
   _SCALING_GOVERNOR_FMT = (
       '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor')
 
   def __init__(self, adb):
@@ skipping 25 matching lines @@
     if self._original_scaling_governor:
       self._SetScalingGovernorInternal(self._original_scaling_governor)
     self._original_scaling_governor = None
 
   def _SetScalingGovernorInternal(self, value):
     for cpu in range(self._kernel_max + 1):
       scaling_governor_file = PerfTestSetup._SCALING_GOVERNOR_FMT % cpu
       if self._adb.Adb().DoesFileExist(scaling_governor_file):
         self._adb.RunShellCommand(
             ('echo %s > ' + scaling_governor_file) % value)