Merge remote branch 'origin/upstream' into tempbranch

server/profilers.py

 import os, shutil, tempfile, logging
 
 import common
 from autotest_lib.client.common_lib import utils, error, profiler_manager
 from autotest_lib.server import profiler, autotest, standalone_profiler, hosts
 
 
 PROFILER_TMPDIR = '/tmp/profilers'
 
 
 def get_profiler_results_dir(autodir):
     """
     Given the directory of the autotest client used to run a profiler,
     return the remote path where profiler results will be stored.
     """
-    return os.path.join(autodir, 'results', 'default', 'barriertest',
+    return os.path.join(autodir, 'results', 'default', 'profiler_sync',
                         'profiling')
 
 
 def get_profiler_log_path(autodir):
     """
     Given the directory of a profiler client, find the client log path.
     """
     return os.path.join(autodir, 'results', 'default', 'debug', 'client.DEBUG')
 
 
@@ skipping 234 matching lines @@
             for profiler in self.list:
                 if not profiler.supports_reboot:
                     msg = 'profiler %s does not support rebooting during tests'
                     msg %= profiler.name
                     self.job.record('WARN', os.path.basename(test.outputdir),
                                     None, msg)
 
             self.report(test, host)
             self.before_start(test, host)
             self.start(test, host)