Write skimage results to full builder_name.

slave/skia_slave_scripts/run_decoding_tests.py

Index: slave/skia_slave_scripts/run_decoding_tests.py
diff --git a/slave/skia_slave_scripts/run_decoding_tests.py b/slave/skia_slave_scripts/run_decoding_tests.py
index 9f0468ed4d642b36a5f82746c89df474ee649d9b..68a2e34d062f808c59c96d8c01b3799d4e7791d4 100644
--- a/slave/skia_slave_scripts/run_decoding_tests.py
+++ b/slave/skia_slave_scripts/run_decoding_tests.py
@@ -16,11 +16,11 @@ class RunDecodingTests(BuildStep):
   def _Run(self):
     cmd = ['-r', self._device_dirs.SKImageInDir(), '--noreencode']
 
-    subdir = builder_name_schema.GetWaterfallBot(self._builder_name)
-
     # Read expectations, which were downloaded/copied to the device.
+    # If this bot is a trybot, read the expected results of the waterfall bot.
     expectations_file = self._flavor_utils.DevicePathJoin(
-      self._device_dirs.SKImageExpectedDir(), subdir,
+      self._device_dirs.SKImageExpectedDir(),
+      builder_name_schema.GetWaterfallBot(self._builder_name),
       GM_EXPECTATIONS_FILENAME)
 
     have_expectations = self._flavor_utils.DevicePathExists(expectations_file)
@@ -28,8 +28,10 @@ class RunDecodingTests(BuildStep):
       cmd.extend(['--readExpectationsPath', expectations_file])
 
     # Write the expectations file, in case any did not match.
+    # If this bot is a trybot, write the actual results under the full trybot
+    # name.

[borenet, 2013/10/11 15:22:49]

I don't think this new comment is really necessary.

[scroggo, 2013/10/11 15:29:44]

Removed.

     device_subdir = self._flavor_utils.DevicePathJoin(
-        self._device_dirs.SKImageOutDir(), subdir)
+        self._device_dirs.SKImageOutDir(), self._builder_name)
     self._flavor_utils.CreateCleanDeviceDirectory(device_subdir)
     output_expectations_file = self._flavor_utils.DevicePathJoin(
         device_subdir, run_gm.JSON_SUMMARY_FILENAME)