reland 'upload SKP renderings that did not match expectations'

slave/skia_slave_scripts/prerender.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.
 
 """ Prepare runtime resources that are needed by Test builders but not
     Bench builders. """
 
 from build_step import BuildStep
 import build_step
 # builder_name_schema must be imported after build_step so the PYTHONPATH will
 # be set properly to import it.
 import builder_name_schema
 import os
 import sys
 
 
 class PreRender(BuildStep):
 
-  def _Run(self):
+  def _RunBeforeGenerateGMs(self):
     # Prepare directory to hold GM expectations.
     self._flavor_utils.CreateCleanDeviceDirectory(
         self._device_dirs.GMExpectedDir())
 
     # Push the GM expectations JSON file to the device.
     device_gm_expectations_path = self._flavor_utils.DevicePathJoin(
         self._device_dirs.GMExpectedDir(), build_step.GM_EXPECTATIONS_FILENAME)
     repo_gm_expectations_path = os.path.join(
         self._gm_expected_dir, build_step.GM_EXPECTATIONS_FILENAME)
     if os.path.exists(repo_gm_expectations_path):
@@ skipping 15 matching lines @@
       self._flavor_utils.PushFileToDevice(repo_ignore_failures_path,
                                           device_ignore_failures_path)
     else:
       print('Missing ignore_failures_file %s' % repo_ignore_failures_path)
 
     # Prepare directory to hold GM actuals.
     self._flavor_utils.CreateCleanHostDirectory(self._gm_actual_dir)
     self._flavor_utils.CreateCleanDeviceDirectory(
         self._flavor_utils.DevicePathJoin(self._device_dirs.GMActualDir(),
                                           self._builder_name))
-    self._flavor_utils.CreateCleanHostDirectory(self.skp_out_dir)
-    self._flavor_utils.CreateCleanDeviceDirectory(self._device_dirs.SKPOutDir())
 
+  def _RunBeforeRunDecodingTests(self):
     # Copy expectations file and images to decode in skimage to device.
     self._flavor_utils.CreateCleanDeviceDirectory(
         self._device_dirs.SKImageExpectedDir())
     skimage_subdir = builder_name_schema.GetWaterfallBot(self._builder_name)
     skimage_expected_filename = build_step.GM_EXPECTATIONS_FILENAME
 
     skimage_host_expectations = os.path.join(self._skimage_expected_dir,
                                              skimage_subdir,
                                              skimage_expected_filename)
 
@@ skipping 12 matching lines @@
       # check can go away.
       if skimage_device_expectations != skimage_host_expectations:
         # Create the subdir on the device.
         self._flavor_utils.CreateCleanDeviceDirectory(skimage_device_subdir)
         self._flavor_utils.PushFileToDevice(skimage_host_expectations,
             skimage_device_expectations)
 
     self._flavor_utils.CopyDirectoryContentsToDevice(
         self._skimage_in_dir, self._device_dirs.SKImageInDir())
 
-
     # Create a directory for the output of skimage
     self._flavor_utils.CreateCleanHostDirectory(self._skimage_out_dir)
     self._flavor_utils.CreateCleanDeviceDirectory(
         self._device_dirs.SKImageOutDir())
 
+  def _RunBeforeRenderSKPs(self):
+    # SKP files have already been installed by DownloadSKPs, so we don't need
+    # to do that here.
+
+    # Install JSON summaries of image expectations.
+    if not os.path.isdir(self.playback_expected_summaries_dir):

[epoger, 2014/05/21 17:10:42]

I think patchset 2 will fix the error seen in
http://108.170.220.120:10117/builders/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug...
:

Traceback (most recent call last):
  File "/usr/lib/python2.7/multiprocessing/process.py", line 258, in _bootstrap
    self.run()
  File
"/home/chrome-bot/buildbot/skiabot-shuttle-ubuntu12-004/buildbot/slave/skia_slave_scripts/build_step.py",
line 315, in run
    self._Run()
  File "../../../../../../slave/skia_slave_scripts/prerender.py", line 118, in
_Run
    self._RunBeforeRenderSKPs()
  File "../../../../../../slave/skia_slave_scripts/prerender.py", line 101, in
_RunBeforeRenderSKPs
    self._device_dirs.PlaybackExpectedSummariesDir())
  File
"/home/chrome-bot/buildbot/skiabot-shuttle-ubuntu12-004/buildbot/slave/skia_slave_scripts/flavor_utils/ssh_build_step_utils.py",
line 118, in CopyDirectoryContentsToDevice
    for filename in os.listdir(host_dir):
OSError: [Errno 2] No such file or directory:
'/home/chrome-bot/buildbot/skiabot-shuttle-ubuntu12-004/buildbot/third_party/chromium_buildbot/slave/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug/build/skia/expectations/skp/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug'

+      os.makedirs(self.playback_expected_summaries_dir)
+    self._flavor_utils.CopyDirectoryContentsToDevice(
+        self.playback_expected_summaries_dir,
+        self._device_dirs.PlaybackExpectedSummariesDir())
+
+    # Prepare directory to hold actually-generated images.
+    self._flavor_utils.CreateCleanHostDirectory(
+        self.playback_actual_images_dir)
+    self._flavor_utils.CreateCleanDeviceDirectory(
+        self._device_dirs.PlaybackActualImagesDir())
+
+    # Prepare directory to hold JSON summaries of actually-generated images.
+    self._flavor_utils.CreateCleanHostDirectory(
+        self.playback_actual_summaries_dir)
+    self._flavor_utils.CreateCleanDeviceDirectory(
+        self._device_dirs.PlaybackActualSummariesDir())
+
+  def _Run(self):
+    self._RunBeforeGenerateGMs()
+    self._RunBeforeRunDecodingTests()
+    self._RunBeforeRenderSKPs()
+
 
 if '__main__' == __name__:
   sys.exit(BuildStep.RunBuildStep(PreRender))