Index: build/android/buildbot/bb_device_steps.py |
diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py |
index 260ec76086b7bbbcc87a69b220167861e72fc8ad..83e809d9078a196b635b7c86a7194de73961d9e8 100755 |
--- a/build/android/buildbot/bb_device_steps.py |
+++ b/build/android/buildbot/bb_device_steps.py |
@@ -24,6 +24,7 @@ sys.path.append(os.path.join( |
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') |
@@ -70,6 +71,10 @@ VALID_TESTS = set(['chromedriver', 'ui', 'unit', 'webkit', 'webkit_layout', |
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.""" |
@@ -225,6 +230,15 @@ def RunWebkitLayoutTests(options): |
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
|
+ '--target', options.target, |
+ '--build-dir', SrcPath('out'), |
bulach
2013/08/21 09:06:14
please, use build/android/pylib/cmd_helper.py :: O
Isaac (away)
2013/08/21 10:10:14
Gosh, I'm not familiar with that. However, we are
Dirk Pranke
2013/08/28 19:45:47
Based on further conversation w/ Isaac, I'm going
|
+ '--build-number', str(options.build_properties.get('buildnumber', '')), |
+ '--builder-name', options.build_properties.get('buildername', '')]) |
+ |
def SpawnLogcatMonitor(): |
shutil.rmtree(LOGCAT_DIR, ignore_errors=True) |