Script to archive profiling data collected from

scripts/slave/runtest.py

 #!/usr/bin/env python
 # 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.
 
 """A tool to run a chrome test executable, used by the buildbot slaves.
 
   When this is run, the current directory (cwd) should be the outer build
   directory (e.g., chrome-release/build/).
 
@@ skipping 285 matching lines @@
       print '@@@STEP_WARNINGS@@@'
       get_text_result = builder.WARNING
   else:
     print '@@@STEP_FAILURE@@@'
     get_text_result = builder.FAILURE
 
   for desc in getText(get_text_result, results_tracker, test_name):
     print '@@@STEP_TEXT@%s@@@' % desc
 
 
+def upload_profiling_data(options):
+  """Using the target build configuration, archive the profiling data to Google
+  Storage.
+  """
+  build_dir = os.path.normpath(os.path.abspath(options.build_dir))
+
+  # Profiling data is in /b/build/slave/SLAVE_NAME/build/src/chrome/test/data
+  profiling_data_dir = os.path.join(build_dir, 'src', 'chrome', 'test', 'data')
+  if not os.path.exists(profiling_data_dir):
+    return True
+
+  profiling_file = os.path.join(profiling_data_dir, 'task_profile.json')
+  if not os.path.exists(profiling_file):
+    return True
+
+  # Profiling tool is in
+  # /b/build/slave/SLAVE_NAME/build/src/build/scripts/slave/chromium
+  profiling_archive_tool = os.path.join(build_dir, 'src', 'build', 'scripts',
+                                        'slave', 'chromium',
+                                        'archive_profiling_data.py')

[cmp, 2012/08/07 18:15:08]

is it possible to collapse this logic into archive_profiling_data.py?  so
instead of passing --profiling-data-dir, we pass --build-dir, and then that
script derives profiling_data_dir within itself?

[ramant (doing other things), 2012/08/07 22:23:55]

Done. Should we move the archive_profiling_data.py to build/scripts/slave?

[cmp, 2012/08/07 23:34:39]

Sure!

[ramant (doing other things), 2012/08/07 23:44:44]

Done.

+
+  if sys.platform == 'win32':
+    python = 'python_slave'
+  else:
+    python = 'python'
+
+  # TODO(rtenneti): get test name.
+  run_id = '%s_%s_%s' % (options.build_properties['got_revision'],
+                         options.build_properties['buildername'],
+                         options.gtest_filter[0:12])
+  cmd = [python,
+         profiling_archive_tool,
+         '--run-id', run_id,
+         '--profiling-data-dir', profiling_data_dir]
+  
+  return chromium_utils.RunCommand(cmd)
+
+
 def main_mac(options, args):
   if len(args) < 1:
     raise chromium_utils.MissingArgument('Usage: %s' % USAGE)
 
   test_exe = args[0]
   build_dir = os.path.normpath(os.path.abspath(options.build_dir))
   test_exe_path = os.path.join(build_dir, options.target, test_exe)
   if not os.path.exists(test_exe_path):
     pre = 'Unable to find %s\n' % test_exe_path
 
@@ skipping 380 matching lines @@
   if sys.platform.startswith('darwin'):
     result = main_mac(options, args)
   elif sys.platform == 'win32':
     result = main_win(options, args)
   elif sys.platform == 'linux2':
     result = main_linux(options, args)
   else:
     sys.stderr.write('Unknown sys.platform value %s\n' % repr(sys.platform))
     return 1
 
+  if ('buildername' in options.build_properties and
+      options.build_properties['buildername'] == 'XP Perf (1)' and

[cmp, 2012/08/07 18:15:08]

let's collapse lines 744 and 745 into:

if (options.build_properties.get('buildername') == 'XP Perf (1)'

[ramant (doing other things), 2012/08/07 22:23:55]

Done.

+      options.build_properties.get('mastername') == 'chromium.perf' and
+      options.gtest_filter == 'StartupTest.*:ShutdownTest.*'):
+    upload_profiling_data(options)
+
   new_temp_files = get_temp_count()
   if temp_files > new_temp_files:
     print >> sys.stderr, (
         'Confused: %d files were deleted from %s during the test run') % (
         (temp_files - new_temp_files), tempfile.gettempdir())
   elif temp_files < new_temp_files:
     print >> sys.stderr, (
         '%d new files were left in %s: Fix the tests to clean up themselves.'
         ) % ((new_temp_files - temp_files), tempfile.gettempdir())
     # TODO(maruel): Make it an error soon. Not yet since I want to iron out all
     # the remaining cases before.
     #result = 1
   return result
 
 
 if '__main__' == __name__:
   sys.exit(main())