Archive webkit_tests results on android bots if requested.

build/android/buildbot/bb_device_steps.py

 #!/usr/bin/env python
 # Copyright (c) 2013 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 collections
 import glob
 import multiprocessing
 import os
 import shutil
 import sys
 
 import bb_utils
 import bb_annotations
 
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 import provision_devices
 from pylib import android_commands
 from pylib import constants
 from pylib.gtest import gtest_config
 
 sys.path.append(os.path.join(
     constants.DIR_SOURCE_ROOT, 'third_party', 'android_testrunner'))
 import errors
 
 
+SLAVE_SCRIPTS_DIR = os.path.join(bb_utils.BB_BUILD_DIR, 'scripts', 'slave')
 CHROME_SRC = constants.DIR_SOURCE_ROOT
 LOGCAT_DIR = os.path.join(CHROME_SRC, 'out', 'logcat')
 
 # Describes an instrumation test suite:
 #   test: Name of test we're running.
 #   apk: apk to be installed.
 #   apk_package: package for the apk to be installed.
 #   test_apk: apk to run tests on.
 #   test_data: data folder in format destination:source.
 #   host_driven_root: The host-driven test root directory.
@@ skipping 26 matching lines @@
       'AndroidWebViewTest',
       'webview:android_webview/test/data/device_files'),
     ])
 
 VALID_TESTS = set(['chromedriver', 'ui', 'unit', 'webkit', 'webkit_layout',
                    'webrtc'])
 
 RunCmd = bb_utils.RunCmd
 
 
+def SrcPath(*path):
+  return os.path.join(constants.DIR_SOURCE_ROOT, *path)
+
+
 # multiprocessing map_async requires a top-level function for pickle library.
 def RebootDeviceSafe(device):
   """Reboot a device, wait for it to start, and squelch timeout exceptions."""
   try:
     android_commands.AndroidCommands(device).Reboot(True)
   except errors.DeviceUnresponsiveError as e:
     return e
 
 
 def RebootDevices():
@@ skipping 135 matching lines @@
         ['--additional-expectations=%s' % os.path.join(CHROME_SRC, *f)])
 
   # TODO(dpranke): Remove this block after
   # https://codereview.chromium.org/12927002/ lands.
   for f in options.factory_properties.get('additional_expectations_files', []):
     cmd_args.extend(
         ['--additional-expectations=%s' % os.path.join(CHROME_SRC, *f)])
 
   RunCmd(['webkit/tools/layout_tests/run_webkit_tests.py'] + cmd_args)
 
+  if options.factory_properties.get('archive_webkit_results', False):
+    bb_annotations.PrintNamedStep('archive_webkit_results')
+    RunCmd([os.path.join(SLAVE_SCRIPTS_DIR, 'archive_layout_test_results.py'),
+        '--results-dir', '..layout-test-results',

[Dirk Pranke, 2013/08/20 23:31:07]

This path seems really wrong, but it matches line 208, so I'm leaving it as is.
Should I change both of them? Is this actually right?

+        '--target', options.target,
+        '--build-dir', SrcPath('out'),

[bulach, 2013/08/21 09:06:14]

please, use build/android/pylib/cmd_helper.py :: OutDirectory.get()

(reason being, there's some efforts to make it possible to build android and
linux in parallel using the same checkout...)

[Isaac (away), 2013/08/21 10:10:14]

Gosh, I'm not familiar with that.  However, we are moving toward allowing 0
outside imports in this repo.  (diagram: go/zosmd), so I don't think we should
add one.  I would suggest putting this as a constant in bb_utils though.

[Dirk Pranke, 2013/08/28 19:45:47]

Based on further conversation w/ Isaac, I'm going to ignore the
OutDirectory.get() for now but use a constant in bb_utils.py . I'm not quit sure
how OutDirectory.get() is used (or, more importantly, set) and how that's going
to need to change in the impending recipe rewrite. 

+        '--build-number', str(options.build_properties.get('buildnumber', '')),
+        '--builder-name', options.build_properties.get('buildername', '')])
+
 
 def SpawnLogcatMonitor():
   shutil.rmtree(LOGCAT_DIR, ignore_errors=True)
   bb_utils.SpawnCmd([
       os.path.join(CHROME_SRC, 'build', 'android', 'adb_logcat_monitor.py'),
       LOGCAT_DIR])
 
   # Wait for logcat_monitor to pull existing logcat
   RunCmd(['sleep', '5'])
 
@@ skipping 141 matching lines @@
   if unknown_tests:
     return sys.exit('Unknown tests %s' % list(unknown_tests))
 
   setattr(options, 'target', options.factory_properties.get('target', 'Debug'))
 
   MainTestWrapper(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))