Run DM on all bots.

I figure there's a lot of special cases and exemptions we may need to steal
from run_tests and run_gm, but might as well for now try as vanilla as
possible.

BUG=skia:
R=borenet@google.com, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/395443002
diff --git a/master/skia_master_scripts/factory.py b/master/skia_master_scripts/factory.py
index ec3d2c6..d0dc1e9 100644
--- a/master/skia_master_scripts/factory.py
+++ b/master/skia_master_scripts/factory.py
@@ -707,6 +707,7 @@
     self.DownloadSKImageFiles()
     self.PreRender()
     self.RunTests()
+    self.RunDM()
     self.RunGM()
     self.RenderSKPs()
     self.RenderPdfs()
diff --git a/master/skia_master_scripts/housekeeping_percommit_factory.py b/master/skia_master_scripts/housekeeping_percommit_factory.py
index e9d8342..3b13849 100644
--- a/master/skia_master_scripts/housekeeping_percommit_factory.py
+++ b/master/skia_master_scripts/housekeeping_percommit_factory.py
@@ -40,7 +40,6 @@
                         description='RunToolSelfTests')
     self.AddSlaveScript(script='run_gm_self_tests.py',
                         description='RunGmSelfTests')
-    self.RunDM()
 
     # Run unittests for Anroid platform_tools
     self.AddSlaveScript(script='run_android_platform_self_tests.py',
diff --git a/slave/skia_slave_scripts/flavor_utils/default_build_step_utils.py b/slave/skia_slave_scripts/flavor_utils/default_build_step_utils.py
index 659080b..3b458f3 100644
--- a/slave/skia_slave_scripts/flavor_utils/default_build_step_utils.py
+++ b/slave/skia_slave_scripts/flavor_utils/default_build_step_utils.py
@@ -94,7 +94,7 @@
 
   def ListBuildStepExecutables(self):
     """ Called by subclasses that may need to install the executables. """
-    return ['tests', 'gm', 'render_pictures', 'render_pdfs',
+    return ['dm', 'tests', 'gm', 'render_pictures', 'render_pdfs',
             'bench', 'bench_pictures', 'skimage', 'nanobench']
 
   def _PathToBinary(self, binary):
diff --git a/slave/skia_slave_scripts/run_dm.py b/slave/skia_slave_scripts/run_dm.py
index 6cbb568..1210cd2 100644
--- a/slave/skia_slave_scripts/run_dm.py
+++ b/slave/skia_slave_scripts/run_dm.py
@@ -11,12 +11,11 @@
 
 class RunDM(BuildStep):
   def _Run(self):
-    args = ['-v']
-    if 'Housekeeper' in self._builder_name:
-      args.append('--nogpu')
-
+    args = [
+      '--verbose',
+      '--resourcePath', self._device_dirs.ResourceDir(),
+    ]
     self._flavor_utils.RunFlavoredCmd('dm', args)
 
-
 if '__main__' == __name__:
   sys.exit(BuildStep.RunBuildStep(RunDM))
diff --git a/tools/tests/factory_configuration/expected/Housekeeper-PerCommit b/tools/tests/factory_configuration/expected/Housekeeper-PerCommit
index fa2ed6a..1e552b9 100644
--- a/tools/tests/factory_configuration/expected/Housekeeper-PerCommit
+++ b/tools/tests/factory_configuration/expected/Housekeeper-PerCommit
@@ -912,60 +912,6 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
-                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
-                    '--autogen_svn_baseurl',
-                    'bogusValueToFixSkBug2663',
-                    '--configuration',
-                    'Debug',
-                    '--deps_target_os',
-                    'None',
-                    '--builder_name',
-                    'Housekeeper-PerCommit',
-                    '--build_number',
-                    <Object>,
-                    '--target_platform',
-                    'linux',
-                    '--revision',
-                    <Object>,
-                    '--got_revision',
-                    <Object>,
-                    '--perf_output_basedir',
-                    'None',
-                    '--make_flags',
-                    '""',
-                    '--test_args',
-                    '""',
-                    '--gm_args',
-                    '""',
-                    '--bench_args',
-                    '""',
-                    '--is_try',
-                    'False',
-                    '--bench_pictures_cfg',
-                    'default',
-                    '--flavor',
-                    'default',
-                ],
-                'description': 'RunDM',
-                'doStepIf': <Object>,
-                'env': {},
-                'exception_on_failure': <Object>,
-                'flunkOnFailure': <Object>,
-                'get_props_from_stdout': None,
-                'haltOnFailure': <Object>,
-                'hideStepIf': <Object>,
-                'is_rebaseline_step': <Object>,
-                'is_upload_step': <Object>,
-                'timeout': <Object>,
-                'workdir': 'build/skia',
-            },
-        ],
-        [
-            <Object>,
-            {
-                'alwaysRun': <Object>,
-                'command': [
-                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_android_platform_self_tests.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Housekeeper-PerCommit-Trybot b/tools/tests/factory_configuration/expected/Housekeeper-PerCommit-Trybot
index 4096a9b..e1e1c92 100644
--- a/tools/tests/factory_configuration/expected/Housekeeper-PerCommit-Trybot
+++ b/tools/tests/factory_configuration/expected/Housekeeper-PerCommit-Trybot
@@ -966,60 +966,6 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
-                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
-                    '--autogen_svn_baseurl',
-                    'bogusValueToFixSkBug2663',
-                    '--configuration',
-                    'Debug',
-                    '--deps_target_os',
-                    'None',
-                    '--builder_name',
-                    'Housekeeper-PerCommit-Trybot',
-                    '--build_number',
-                    <Object>,
-                    '--target_platform',
-                    'linux',
-                    '--revision',
-                    <Object>,
-                    '--got_revision',
-                    <Object>,
-                    '--perf_output_basedir',
-                    'None',
-                    '--make_flags',
-                    '""',
-                    '--test_args',
-                    '""',
-                    '--gm_args',
-                    '""',
-                    '--bench_args',
-                    '""',
-                    '--is_try',
-                    'True',
-                    '--bench_pictures_cfg',
-                    'default',
-                    '--flavor',
-                    'default',
-                ],
-                'description': 'RunDM',
-                'doStepIf': <Object>,
-                'env': {},
-                'exception_on_failure': <Object>,
-                'flunkOnFailure': <Object>,
-                'get_props_from_stdout': None,
-                'haltOnFailure': <Object>,
-                'hideStepIf': <Object>,
-                'is_rebaseline_step': <Object>,
-                'is_upload_step': <Object>,
-                'timeout': <Object>,
-                'workdir': 'build/skia',
-            },
-        ],
-        [
-            <Object>,
-            {
-                'alwaysRun': <Object>,
-                'command': [
-                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_android_platform_self_tests.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Android-GalaxyNexus-SGX540-Arm7-Debug b/tools/tests/factory_configuration/expected/Test-Android-GalaxyNexus-SGX540-Arm7-Debug
index f8fbf68..a216a91 100644
--- a/tools/tests/factory_configuration/expected/Test-Android-GalaxyNexus-SGX540-Arm7-Debug
+++ b/tools/tests/factory_configuration/expected/Test-Android-GalaxyNexus-SGX540-Arm7-Debug
@@ -830,6 +830,68 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'android',
+                    '--builder_name',
+                    'Test-Android-GalaxyNexus-SGX540-Arm7-Debug',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '"--match ~Threaded"',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'galaxy_nexus',
+                    '--device',
+                    'galaxy_nexus',
+                    '--serial',
+                    <Object>,
+                    '--has_root',
+                    <Object>,
+                    '--android_sdk_root',
+                    <Object>,
+                    '--flavor',
+                    'android',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Android-GalaxyNexus-SGX540-Arm7-Debug-Trybot b/tools/tests/factory_configuration/expected/Test-Android-GalaxyNexus-SGX540-Arm7-Debug-Trybot
index b037759..207163f 100644
--- a/tools/tests/factory_configuration/expected/Test-Android-GalaxyNexus-SGX540-Arm7-Debug-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Android-GalaxyNexus-SGX540-Arm7-Debug-Trybot
@@ -892,6 +892,68 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'android',
+                    '--builder_name',
+                    'Test-Android-GalaxyNexus-SGX540-Arm7-Debug-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '"--match ~Threaded"',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'galaxy_nexus',
+                    '--device',
+                    'galaxy_nexus',
+                    '--serial',
+                    <Object>,
+                    '--has_root',
+                    <Object>,
+                    '--android_sdk_root',
+                    <Object>,
+                    '--flavor',
+                    'android',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Android-GalaxyNexus-SGX540-Arm7-Release b/tools/tests/factory_configuration/expected/Test-Android-GalaxyNexus-SGX540-Arm7-Release
index 1c6ec62..7682f92 100644
--- a/tools/tests/factory_configuration/expected/Test-Android-GalaxyNexus-SGX540-Arm7-Release
+++ b/tools/tests/factory_configuration/expected/Test-Android-GalaxyNexus-SGX540-Arm7-Release
@@ -830,6 +830,68 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'android',
+                    '--builder_name',
+                    'Test-Android-GalaxyNexus-SGX540-Arm7-Release',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '"--match ~Threaded"',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'galaxy_nexus',
+                    '--device',
+                    'galaxy_nexus',
+                    '--serial',
+                    <Object>,
+                    '--has_root',
+                    <Object>,
+                    '--android_sdk_root',
+                    <Object>,
+                    '--flavor',
+                    'android',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Android-GalaxyNexus-SGX540-Arm7-Release-Trybot b/tools/tests/factory_configuration/expected/Test-Android-GalaxyNexus-SGX540-Arm7-Release-Trybot
index 01885f1..c2db7b2 100644
--- a/tools/tests/factory_configuration/expected/Test-Android-GalaxyNexus-SGX540-Arm7-Release-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Android-GalaxyNexus-SGX540-Arm7-Release-Trybot
@@ -892,6 +892,68 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'android',
+                    '--builder_name',
+                    'Test-Android-GalaxyNexus-SGX540-Arm7-Release-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '"--match ~Threaded"',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'galaxy_nexus',
+                    '--device',
+                    'galaxy_nexus',
+                    '--serial',
+                    <Object>,
+                    '--has_root',
+                    <Object>,
+                    '--android_sdk_root',
+                    <Object>,
+                    '--flavor',
+                    'android',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Android-IntelRhb-SGX544-x86-Debug b/tools/tests/factory_configuration/expected/Test-Android-IntelRhb-SGX544-x86-Debug
index f8dd417..c1a6c31 100644
--- a/tools/tests/factory_configuration/expected/Test-Android-IntelRhb-SGX544-x86-Debug
+++ b/tools/tests/factory_configuration/expected/Test-Android-IntelRhb-SGX544-x86-Debug
@@ -830,6 +830,68 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'android',
+                    '--builder_name',
+                    'Test-Android-IntelRhb-SGX544-x86-Debug',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '"--match ~Threaded"',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'intel_rhb',
+                    '--device',
+                    'intel_rhb',
+                    '--serial',
+                    <Object>,
+                    '--has_root',
+                    <Object>,
+                    '--android_sdk_root',
+                    <Object>,
+                    '--flavor',
+                    'android',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Android-IntelRhb-SGX544-x86-Debug-Trybot b/tools/tests/factory_configuration/expected/Test-Android-IntelRhb-SGX544-x86-Debug-Trybot
index be0aa0f..4484b20 100644
--- a/tools/tests/factory_configuration/expected/Test-Android-IntelRhb-SGX544-x86-Debug-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Android-IntelRhb-SGX544-x86-Debug-Trybot
@@ -892,6 +892,68 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'android',
+                    '--builder_name',
+                    'Test-Android-IntelRhb-SGX544-x86-Debug-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '"--match ~Threaded"',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'intel_rhb',
+                    '--device',
+                    'intel_rhb',
+                    '--serial',
+                    <Object>,
+                    '--has_root',
+                    <Object>,
+                    '--android_sdk_root',
+                    <Object>,
+                    '--flavor',
+                    'android',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Android-IntelRhb-SGX544-x86-Release b/tools/tests/factory_configuration/expected/Test-Android-IntelRhb-SGX544-x86-Release
index 28dbcaa..77c6619 100644
--- a/tools/tests/factory_configuration/expected/Test-Android-IntelRhb-SGX544-x86-Release
+++ b/tools/tests/factory_configuration/expected/Test-Android-IntelRhb-SGX544-x86-Release
@@ -830,6 +830,68 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'android',
+                    '--builder_name',
+                    'Test-Android-IntelRhb-SGX544-x86-Release',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '"--match ~Threaded"',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'intel_rhb',
+                    '--device',
+                    'intel_rhb',
+                    '--serial',
+                    <Object>,
+                    '--has_root',
+                    <Object>,
+                    '--android_sdk_root',
+                    <Object>,
+                    '--flavor',
+                    'android',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Android-IntelRhb-SGX544-x86-Release-Trybot b/tools/tests/factory_configuration/expected/Test-Android-IntelRhb-SGX544-x86-Release-Trybot
index 1250001..b9a702d 100644
--- a/tools/tests/factory_configuration/expected/Test-Android-IntelRhb-SGX544-x86-Release-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Android-IntelRhb-SGX544-x86-Release-Trybot
@@ -892,6 +892,68 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'android',
+                    '--builder_name',
+                    'Test-Android-IntelRhb-SGX544-x86-Release-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '"--match ~Threaded"',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'intel_rhb',
+                    '--device',
+                    'intel_rhb',
+                    '--serial',
+                    <Object>,
+                    '--has_root',
+                    <Object>,
+                    '--android_sdk_root',
+                    <Object>,
+                    '--flavor',
+                    'android',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Android-Logan-Nvidia-Arm7-Debug b/tools/tests/factory_configuration/expected/Test-Android-Logan-Nvidia-Arm7-Debug
index f93ef37..4297945 100644
--- a/tools/tests/factory_configuration/expected/Test-Android-Logan-Nvidia-Arm7-Debug
+++ b/tools/tests/factory_configuration/expected/Test-Android-Logan-Nvidia-Arm7-Debug
@@ -830,6 +830,68 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'android',
+                    '--builder_name',
+                    'Test-Android-Logan-Nvidia-Arm7-Debug',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '"--match ~Threaded"',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'nvidia_logan',
+                    '--device',
+                    'nvidia_logan',
+                    '--serial',
+                    <Object>,
+                    '--has_root',
+                    <Object>,
+                    '--android_sdk_root',
+                    <Object>,
+                    '--flavor',
+                    'android',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Android-Logan-Nvidia-Arm7-Debug-Trybot b/tools/tests/factory_configuration/expected/Test-Android-Logan-Nvidia-Arm7-Debug-Trybot
index 76e583b..c980024 100644
--- a/tools/tests/factory_configuration/expected/Test-Android-Logan-Nvidia-Arm7-Debug-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Android-Logan-Nvidia-Arm7-Debug-Trybot
@@ -892,6 +892,68 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'android',
+                    '--builder_name',
+                    'Test-Android-Logan-Nvidia-Arm7-Debug-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '"--match ~Threaded"',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'nvidia_logan',
+                    '--device',
+                    'nvidia_logan',
+                    '--serial',
+                    <Object>,
+                    '--has_root',
+                    <Object>,
+                    '--android_sdk_root',
+                    <Object>,
+                    '--flavor',
+                    'android',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Android-Logan-Nvidia-Arm7-Release b/tools/tests/factory_configuration/expected/Test-Android-Logan-Nvidia-Arm7-Release
index 6807585..c491036 100644
--- a/tools/tests/factory_configuration/expected/Test-Android-Logan-Nvidia-Arm7-Release
+++ b/tools/tests/factory_configuration/expected/Test-Android-Logan-Nvidia-Arm7-Release
@@ -830,6 +830,68 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'android',
+                    '--builder_name',
+                    'Test-Android-Logan-Nvidia-Arm7-Release',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '"--match ~Threaded"',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'nvidia_logan',
+                    '--device',
+                    'nvidia_logan',
+                    '--serial',
+                    <Object>,
+                    '--has_root',
+                    <Object>,
+                    '--android_sdk_root',
+                    <Object>,
+                    '--flavor',
+                    'android',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Android-Logan-Nvidia-Arm7-Release-Trybot b/tools/tests/factory_configuration/expected/Test-Android-Logan-Nvidia-Arm7-Release-Trybot
index cc3ead1..cc6fac8 100644
--- a/tools/tests/factory_configuration/expected/Test-Android-Logan-Nvidia-Arm7-Release-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Android-Logan-Nvidia-Arm7-Release-Trybot
@@ -892,6 +892,68 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'android',
+                    '--builder_name',
+                    'Test-Android-Logan-Nvidia-Arm7-Release-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '"--match ~Threaded"',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'nvidia_logan',
+                    '--device',
+                    'nvidia_logan',
+                    '--serial',
+                    <Object>,
+                    '--has_root',
+                    <Object>,
+                    '--android_sdk_root',
+                    <Object>,
+                    '--flavor',
+                    'android',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Android-Nexus10-MaliT604-Arm7-Debug b/tools/tests/factory_configuration/expected/Test-Android-Nexus10-MaliT604-Arm7-Debug
index d6a9ccd..48c0f24 100644
--- a/tools/tests/factory_configuration/expected/Test-Android-Nexus10-MaliT604-Arm7-Debug
+++ b/tools/tests/factory_configuration/expected/Test-Android-Nexus10-MaliT604-Arm7-Debug
@@ -830,6 +830,68 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'android',
+                    '--builder_name',
+                    'Test-Android-Nexus10-MaliT604-Arm7-Debug',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '"--match ~Threaded"',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'nexus_10',
+                    '--device',
+                    'nexus_10',
+                    '--serial',
+                    <Object>,
+                    '--has_root',
+                    <Object>,
+                    '--android_sdk_root',
+                    <Object>,
+                    '--flavor',
+                    'android',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Android-Nexus10-MaliT604-Arm7-Debug-Trybot b/tools/tests/factory_configuration/expected/Test-Android-Nexus10-MaliT604-Arm7-Debug-Trybot
index b1f62d4..e31c1e2 100644
--- a/tools/tests/factory_configuration/expected/Test-Android-Nexus10-MaliT604-Arm7-Debug-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Android-Nexus10-MaliT604-Arm7-Debug-Trybot
@@ -892,6 +892,68 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'android',
+                    '--builder_name',
+                    'Test-Android-Nexus10-MaliT604-Arm7-Debug-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '"--match ~Threaded"',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'nexus_10',
+                    '--device',
+                    'nexus_10',
+                    '--serial',
+                    <Object>,
+                    '--has_root',
+                    <Object>,
+                    '--android_sdk_root',
+                    <Object>,
+                    '--flavor',
+                    'android',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Android-Nexus10-MaliT604-Arm7-Release b/tools/tests/factory_configuration/expected/Test-Android-Nexus10-MaliT604-Arm7-Release
index debbd35..9be835e 100644
--- a/tools/tests/factory_configuration/expected/Test-Android-Nexus10-MaliT604-Arm7-Release
+++ b/tools/tests/factory_configuration/expected/Test-Android-Nexus10-MaliT604-Arm7-Release
@@ -830,6 +830,68 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'android',
+                    '--builder_name',
+                    'Test-Android-Nexus10-MaliT604-Arm7-Release',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '"--match ~Threaded"',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'nexus_10',
+                    '--device',
+                    'nexus_10',
+                    '--serial',
+                    <Object>,
+                    '--has_root',
+                    <Object>,
+                    '--android_sdk_root',
+                    <Object>,
+                    '--flavor',
+                    'android',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Android-Nexus10-MaliT604-Arm7-Release-Trybot b/tools/tests/factory_configuration/expected/Test-Android-Nexus10-MaliT604-Arm7-Release-Trybot
index 59cd5d6..c00164d 100644
--- a/tools/tests/factory_configuration/expected/Test-Android-Nexus10-MaliT604-Arm7-Release-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Android-Nexus10-MaliT604-Arm7-Release-Trybot
@@ -892,6 +892,68 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'android',
+                    '--builder_name',
+                    'Test-Android-Nexus10-MaliT604-Arm7-Release-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '"--match ~Threaded"',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'nexus_10',
+                    '--device',
+                    'nexus_10',
+                    '--serial',
+                    <Object>,
+                    '--has_root',
+                    <Object>,
+                    '--android_sdk_root',
+                    <Object>,
+                    '--flavor',
+                    'android',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Android-Nexus4-Adreno320-Arm7-Debug b/tools/tests/factory_configuration/expected/Test-Android-Nexus4-Adreno320-Arm7-Debug
index 9b4bdf1..8a7f614 100644
--- a/tools/tests/factory_configuration/expected/Test-Android-Nexus4-Adreno320-Arm7-Debug
+++ b/tools/tests/factory_configuration/expected/Test-Android-Nexus4-Adreno320-Arm7-Debug
@@ -830,6 +830,68 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'android',
+                    '--builder_name',
+                    'Test-Android-Nexus4-Adreno320-Arm7-Debug',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '"--match ~Threaded"',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'nexus_4',
+                    '--device',
+                    'nexus_4',
+                    '--serial',
+                    <Object>,
+                    '--has_root',
+                    <Object>,
+                    '--android_sdk_root',
+                    <Object>,
+                    '--flavor',
+                    'android',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Android-Nexus4-Adreno320-Arm7-Debug-Trybot b/tools/tests/factory_configuration/expected/Test-Android-Nexus4-Adreno320-Arm7-Debug-Trybot
index 5f6be3d..96bb404 100644
--- a/tools/tests/factory_configuration/expected/Test-Android-Nexus4-Adreno320-Arm7-Debug-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Android-Nexus4-Adreno320-Arm7-Debug-Trybot
@@ -892,6 +892,68 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'android',
+                    '--builder_name',
+                    'Test-Android-Nexus4-Adreno320-Arm7-Debug-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '"--match ~Threaded"',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'nexus_4',
+                    '--device',
+                    'nexus_4',
+                    '--serial',
+                    <Object>,
+                    '--has_root',
+                    <Object>,
+                    '--android_sdk_root',
+                    <Object>,
+                    '--flavor',
+                    'android',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Android-Nexus4-Adreno320-Arm7-Release b/tools/tests/factory_configuration/expected/Test-Android-Nexus4-Adreno320-Arm7-Release
index b651c70..ee7ddc9 100644
--- a/tools/tests/factory_configuration/expected/Test-Android-Nexus4-Adreno320-Arm7-Release
+++ b/tools/tests/factory_configuration/expected/Test-Android-Nexus4-Adreno320-Arm7-Release
@@ -830,6 +830,68 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'android',
+                    '--builder_name',
+                    'Test-Android-Nexus4-Adreno320-Arm7-Release',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '"--match ~Threaded"',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'nexus_4',
+                    '--device',
+                    'nexus_4',
+                    '--serial',
+                    <Object>,
+                    '--has_root',
+                    <Object>,
+                    '--android_sdk_root',
+                    <Object>,
+                    '--flavor',
+                    'android',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Android-Nexus4-Adreno320-Arm7-Release-Trybot b/tools/tests/factory_configuration/expected/Test-Android-Nexus4-Adreno320-Arm7-Release-Trybot
index e24e343..8f61169 100644
--- a/tools/tests/factory_configuration/expected/Test-Android-Nexus4-Adreno320-Arm7-Release-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Android-Nexus4-Adreno320-Arm7-Release-Trybot
@@ -892,6 +892,68 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'android',
+                    '--builder_name',
+                    'Test-Android-Nexus4-Adreno320-Arm7-Release-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '"--match ~Threaded"',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'nexus_4',
+                    '--device',
+                    'nexus_4',
+                    '--serial',
+                    <Object>,
+                    '--has_root',
+                    <Object>,
+                    '--android_sdk_root',
+                    <Object>,
+                    '--flavor',
+                    'android',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Android-Nexus7-Tegra3-Arm7-Debug b/tools/tests/factory_configuration/expected/Test-Android-Nexus7-Tegra3-Arm7-Debug
index 44809d2..8f97300 100644
--- a/tools/tests/factory_configuration/expected/Test-Android-Nexus7-Tegra3-Arm7-Debug
+++ b/tools/tests/factory_configuration/expected/Test-Android-Nexus7-Tegra3-Arm7-Debug
@@ -830,6 +830,68 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'android',
+                    '--builder_name',
+                    'Test-Android-Nexus7-Tegra3-Arm7-Debug',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '"--match ~Threaded"',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'nexus_7',
+                    '--device',
+                    'nexus_7',
+                    '--serial',
+                    <Object>,
+                    '--has_root',
+                    <Object>,
+                    '--android_sdk_root',
+                    <Object>,
+                    '--flavor',
+                    'android',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Android-Nexus7-Tegra3-Arm7-Debug-Trybot b/tools/tests/factory_configuration/expected/Test-Android-Nexus7-Tegra3-Arm7-Debug-Trybot
index 2c281fe..0b20771 100644
--- a/tools/tests/factory_configuration/expected/Test-Android-Nexus7-Tegra3-Arm7-Debug-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Android-Nexus7-Tegra3-Arm7-Debug-Trybot
@@ -892,6 +892,68 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'android',
+                    '--builder_name',
+                    'Test-Android-Nexus7-Tegra3-Arm7-Debug-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '"--match ~Threaded"',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'nexus_7',
+                    '--device',
+                    'nexus_7',
+                    '--serial',
+                    <Object>,
+                    '--has_root',
+                    <Object>,
+                    '--android_sdk_root',
+                    <Object>,
+                    '--flavor',
+                    'android',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Android-Nexus7-Tegra3-Arm7-Release b/tools/tests/factory_configuration/expected/Test-Android-Nexus7-Tegra3-Arm7-Release
index 505abb9..bbdd00a 100644
--- a/tools/tests/factory_configuration/expected/Test-Android-Nexus7-Tegra3-Arm7-Release
+++ b/tools/tests/factory_configuration/expected/Test-Android-Nexus7-Tegra3-Arm7-Release
@@ -830,6 +830,68 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'android',
+                    '--builder_name',
+                    'Test-Android-Nexus7-Tegra3-Arm7-Release',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '"--match ~Threaded"',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'nexus_7',
+                    '--device',
+                    'nexus_7',
+                    '--serial',
+                    <Object>,
+                    '--has_root',
+                    <Object>,
+                    '--android_sdk_root',
+                    <Object>,
+                    '--flavor',
+                    'android',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Android-Nexus7-Tegra3-Arm7-Release-Trybot b/tools/tests/factory_configuration/expected/Test-Android-Nexus7-Tegra3-Arm7-Release-Trybot
index 328e84d..758fa9b 100644
--- a/tools/tests/factory_configuration/expected/Test-Android-Nexus7-Tegra3-Arm7-Release-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Android-Nexus7-Tegra3-Arm7-Release-Trybot
@@ -892,6 +892,68 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'android',
+                    '--builder_name',
+                    'Test-Android-Nexus7-Tegra3-Arm7-Release-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '"--match ~Threaded"',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'nexus_7',
+                    '--device',
+                    'nexus_7',
+                    '--serial',
+                    <Object>,
+                    '--has_root',
+                    <Object>,
+                    '--android_sdk_root',
+                    <Object>,
+                    '--flavor',
+                    'android',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Android-NexusS-SGX540-Arm7-Debug b/tools/tests/factory_configuration/expected/Test-Android-NexusS-SGX540-Arm7-Debug
index c34657f..1d9d6a2 100644
--- a/tools/tests/factory_configuration/expected/Test-Android-NexusS-SGX540-Arm7-Debug
+++ b/tools/tests/factory_configuration/expected/Test-Android-NexusS-SGX540-Arm7-Debug
@@ -830,6 +830,68 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'android',
+                    '--builder_name',
+                    'Test-Android-NexusS-SGX540-Arm7-Debug',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '"--match ~Threaded"',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'nexus_s',
+                    '--device',
+                    'nexus_s',
+                    '--serial',
+                    <Object>,
+                    '--has_root',
+                    <Object>,
+                    '--android_sdk_root',
+                    <Object>,
+                    '--flavor',
+                    'android',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Android-NexusS-SGX540-Arm7-Debug-Trybot b/tools/tests/factory_configuration/expected/Test-Android-NexusS-SGX540-Arm7-Debug-Trybot
index 9a2be60..5646dde 100644
--- a/tools/tests/factory_configuration/expected/Test-Android-NexusS-SGX540-Arm7-Debug-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Android-NexusS-SGX540-Arm7-Debug-Trybot
@@ -892,6 +892,68 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'android',
+                    '--builder_name',
+                    'Test-Android-NexusS-SGX540-Arm7-Debug-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '"--match ~Threaded"',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'nexus_s',
+                    '--device',
+                    'nexus_s',
+                    '--serial',
+                    <Object>,
+                    '--has_root',
+                    <Object>,
+                    '--android_sdk_root',
+                    <Object>,
+                    '--flavor',
+                    'android',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Android-NexusS-SGX540-Arm7-Release b/tools/tests/factory_configuration/expected/Test-Android-NexusS-SGX540-Arm7-Release
index 6024503..f428b09 100644
--- a/tools/tests/factory_configuration/expected/Test-Android-NexusS-SGX540-Arm7-Release
+++ b/tools/tests/factory_configuration/expected/Test-Android-NexusS-SGX540-Arm7-Release
@@ -830,6 +830,68 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'android',
+                    '--builder_name',
+                    'Test-Android-NexusS-SGX540-Arm7-Release',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '"--match ~Threaded"',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'nexus_s',
+                    '--device',
+                    'nexus_s',
+                    '--serial',
+                    <Object>,
+                    '--has_root',
+                    <Object>,
+                    '--android_sdk_root',
+                    <Object>,
+                    '--flavor',
+                    'android',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Android-NexusS-SGX540-Arm7-Release-Trybot b/tools/tests/factory_configuration/expected/Test-Android-NexusS-SGX540-Arm7-Release-Trybot
index be06dea..6cadaa9 100644
--- a/tools/tests/factory_configuration/expected/Test-Android-NexusS-SGX540-Arm7-Release-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Android-NexusS-SGX540-Arm7-Release-Trybot
@@ -892,6 +892,68 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'android',
+                    '--builder_name',
+                    'Test-Android-NexusS-SGX540-Arm7-Release-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '"--match ~Threaded"',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'nexus_s',
+                    '--device',
+                    'nexus_s',
+                    '--serial',
+                    <Object>,
+                    '--has_root',
+                    <Object>,
+                    '--android_sdk_root',
+                    <Object>,
+                    '--flavor',
+                    'android',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Android-Xoom-Tegra2-Arm7-Debug b/tools/tests/factory_configuration/expected/Test-Android-Xoom-Tegra2-Arm7-Debug
index a4f9251..a3f0a95 100644
--- a/tools/tests/factory_configuration/expected/Test-Android-Xoom-Tegra2-Arm7-Debug
+++ b/tools/tests/factory_configuration/expected/Test-Android-Xoom-Tegra2-Arm7-Debug
@@ -830,6 +830,68 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'android',
+                    '--builder_name',
+                    'Test-Android-Xoom-Tegra2-Arm7-Debug',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '"--match ~Threaded"',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'xoom',
+                    '--device',
+                    'xoom',
+                    '--serial',
+                    <Object>,
+                    '--has_root',
+                    <Object>,
+                    '--android_sdk_root',
+                    <Object>,
+                    '--flavor',
+                    'android',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Android-Xoom-Tegra2-Arm7-Debug-Trybot b/tools/tests/factory_configuration/expected/Test-Android-Xoom-Tegra2-Arm7-Debug-Trybot
index 434e141..9882ece 100644
--- a/tools/tests/factory_configuration/expected/Test-Android-Xoom-Tegra2-Arm7-Debug-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Android-Xoom-Tegra2-Arm7-Debug-Trybot
@@ -892,6 +892,68 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'android',
+                    '--builder_name',
+                    'Test-Android-Xoom-Tegra2-Arm7-Debug-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '"--match ~Threaded"',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'xoom',
+                    '--device',
+                    'xoom',
+                    '--serial',
+                    <Object>,
+                    '--has_root',
+                    <Object>,
+                    '--android_sdk_root',
+                    <Object>,
+                    '--flavor',
+                    'android',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Android-Xoom-Tegra2-Arm7-Release b/tools/tests/factory_configuration/expected/Test-Android-Xoom-Tegra2-Arm7-Release
index 8d36814..4787e7f 100644
--- a/tools/tests/factory_configuration/expected/Test-Android-Xoom-Tegra2-Arm7-Release
+++ b/tools/tests/factory_configuration/expected/Test-Android-Xoom-Tegra2-Arm7-Release
@@ -830,6 +830,68 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'android',
+                    '--builder_name',
+                    'Test-Android-Xoom-Tegra2-Arm7-Release',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '"--match ~Threaded"',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'xoom',
+                    '--device',
+                    'xoom',
+                    '--serial',
+                    <Object>,
+                    '--has_root',
+                    <Object>,
+                    '--android_sdk_root',
+                    <Object>,
+                    '--flavor',
+                    'android',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Android-Xoom-Tegra2-Arm7-Release-Trybot b/tools/tests/factory_configuration/expected/Test-Android-Xoom-Tegra2-Arm7-Release-Trybot
index 22e1121..62df222 100644
--- a/tools/tests/factory_configuration/expected/Test-Android-Xoom-Tegra2-Arm7-Release-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Android-Xoom-Tegra2-Arm7-Release-Trybot
@@ -892,6 +892,68 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'android',
+                    '--builder_name',
+                    'Test-Android-Xoom-Tegra2-Arm7-Release-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '"--match ~Threaded"',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'xoom',
+                    '--device',
+                    'xoom',
+                    '--serial',
+                    <Object>,
+                    '--has_root',
+                    <Object>,
+                    '--android_sdk_root',
+                    <Object>,
+                    '--flavor',
+                    'android',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-ChromeOS-Alex-GMA3150-x86-Debug b/tools/tests/factory_configuration/expected/Test-ChromeOS-Alex-GMA3150-x86-Debug
index 8d922f4..35252e3 100644
--- a/tools/tests/factory_configuration/expected/Test-ChromeOS-Alex-GMA3150-x86-Debug
+++ b/tools/tests/factory_configuration/expected/Test-ChromeOS-Alex-GMA3150-x86-Debug
@@ -803,6 +803,66 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'chromeos',
+                    '--builder_name',
+                    'Test-ChromeOS-Alex-GMA3150-x86-Debug',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'no_gpu',
+                    '--ssh_host',
+                    <Object>,
+                    '--ssh_port',
+                    <Object>,
+                    '--board',
+                    'x86-alex',
+                    '--flavor',
+                    'chromeos',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-ChromeOS-Alex-GMA3150-x86-Debug-Trybot b/tools/tests/factory_configuration/expected/Test-ChromeOS-Alex-GMA3150-x86-Debug-Trybot
index 4a3bfcd..8c373ab 100644
--- a/tools/tests/factory_configuration/expected/Test-ChromeOS-Alex-GMA3150-x86-Debug-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-ChromeOS-Alex-GMA3150-x86-Debug-Trybot
@@ -863,6 +863,66 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'chromeos',
+                    '--builder_name',
+                    'Test-ChromeOS-Alex-GMA3150-x86-Debug-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'no_gpu',
+                    '--ssh_host',
+                    <Object>,
+                    '--ssh_port',
+                    <Object>,
+                    '--board',
+                    'x86-alex',
+                    '--flavor',
+                    'chromeos',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-ChromeOS-Alex-GMA3150-x86-Release b/tools/tests/factory_configuration/expected/Test-ChromeOS-Alex-GMA3150-x86-Release
index 2904b79..e90b293 100644
--- a/tools/tests/factory_configuration/expected/Test-ChromeOS-Alex-GMA3150-x86-Release
+++ b/tools/tests/factory_configuration/expected/Test-ChromeOS-Alex-GMA3150-x86-Release
@@ -803,6 +803,66 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'chromeos',
+                    '--builder_name',
+                    'Test-ChromeOS-Alex-GMA3150-x86-Release',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'no_gpu',
+                    '--ssh_host',
+                    <Object>,
+                    '--ssh_port',
+                    <Object>,
+                    '--board',
+                    'x86-alex',
+                    '--flavor',
+                    'chromeos',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-ChromeOS-Alex-GMA3150-x86-Release-Trybot b/tools/tests/factory_configuration/expected/Test-ChromeOS-Alex-GMA3150-x86-Release-Trybot
index 33fa95e..af80646 100644
--- a/tools/tests/factory_configuration/expected/Test-ChromeOS-Alex-GMA3150-x86-Release-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-ChromeOS-Alex-GMA3150-x86-Release-Trybot
@@ -863,6 +863,66 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'chromeos',
+                    '--builder_name',
+                    'Test-ChromeOS-Alex-GMA3150-x86-Release-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'no_gpu',
+                    '--ssh_host',
+                    <Object>,
+                    '--ssh_port',
+                    <Object>,
+                    '--board',
+                    'x86-alex',
+                    '--flavor',
+                    'chromeos',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug b/tools/tests/factory_configuration/expected/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug
index c5b9961..fe48e3e 100644
--- a/tools/tests/factory_configuration/expected/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug
+++ b/tools/tests/factory_configuration/expected/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug
@@ -803,6 +803,66 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'chromeos',
+                    '--builder_name',
+                    'Test-ChromeOS-Daisy-MaliT604-Arm7-Debug',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'no_gpu',
+                    '--ssh_host',
+                    <Object>,
+                    '--ssh_port',
+                    <Object>,
+                    '--board',
+                    'daisy',
+                    '--flavor',
+                    'chromeos',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug-Trybot b/tools/tests/factory_configuration/expected/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug-Trybot
index a317413..01506de 100644
--- a/tools/tests/factory_configuration/expected/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug-Trybot
@@ -863,6 +863,66 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'chromeos',
+                    '--builder_name',
+                    'Test-ChromeOS-Daisy-MaliT604-Arm7-Debug-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'no_gpu',
+                    '--ssh_host',
+                    <Object>,
+                    '--ssh_port',
+                    <Object>,
+                    '--board',
+                    'daisy',
+                    '--flavor',
+                    'chromeos',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-ChromeOS-Daisy-MaliT604-Arm7-Release b/tools/tests/factory_configuration/expected/Test-ChromeOS-Daisy-MaliT604-Arm7-Release
index f591c21..46e782a 100644
--- a/tools/tests/factory_configuration/expected/Test-ChromeOS-Daisy-MaliT604-Arm7-Release
+++ b/tools/tests/factory_configuration/expected/Test-ChromeOS-Daisy-MaliT604-Arm7-Release
@@ -803,6 +803,66 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'chromeos',
+                    '--builder_name',
+                    'Test-ChromeOS-Daisy-MaliT604-Arm7-Release',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'no_gpu',
+                    '--ssh_host',
+                    <Object>,
+                    '--ssh_port',
+                    <Object>,
+                    '--board',
+                    'daisy',
+                    '--flavor',
+                    'chromeos',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-ChromeOS-Daisy-MaliT604-Arm7-Release-Trybot b/tools/tests/factory_configuration/expected/Test-ChromeOS-Daisy-MaliT604-Arm7-Release-Trybot
index 5587970..46f045a 100644
--- a/tools/tests/factory_configuration/expected/Test-ChromeOS-Daisy-MaliT604-Arm7-Release-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-ChromeOS-Daisy-MaliT604-Arm7-Release-Trybot
@@ -863,6 +863,66 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'chromeos',
+                    '--builder_name',
+                    'Test-ChromeOS-Daisy-MaliT604-Arm7-Release-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'no_gpu',
+                    '--ssh_host',
+                    <Object>,
+                    '--ssh_port',
+                    <Object>,
+                    '--board',
+                    'daisy',
+                    '--flavor',
+                    'chromeos',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-ChromeOS-Link-HD4000-x86_64-Debug b/tools/tests/factory_configuration/expected/Test-ChromeOS-Link-HD4000-x86_64-Debug
index 04e6138..61669c6 100644
--- a/tools/tests/factory_configuration/expected/Test-ChromeOS-Link-HD4000-x86_64-Debug
+++ b/tools/tests/factory_configuration/expected/Test-ChromeOS-Link-HD4000-x86_64-Debug
@@ -803,6 +803,66 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'chromeos',
+                    '--builder_name',
+                    'Test-ChromeOS-Link-HD4000-x86_64-Debug',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'no_gpu',
+                    '--ssh_host',
+                    <Object>,
+                    '--ssh_port',
+                    <Object>,
+                    '--board',
+                    'link',
+                    '--flavor',
+                    'chromeos',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-ChromeOS-Link-HD4000-x86_64-Debug-Trybot b/tools/tests/factory_configuration/expected/Test-ChromeOS-Link-HD4000-x86_64-Debug-Trybot
index d3c574d..cf41a67 100644
--- a/tools/tests/factory_configuration/expected/Test-ChromeOS-Link-HD4000-x86_64-Debug-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-ChromeOS-Link-HD4000-x86_64-Debug-Trybot
@@ -863,6 +863,66 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'chromeos',
+                    '--builder_name',
+                    'Test-ChromeOS-Link-HD4000-x86_64-Debug-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'no_gpu',
+                    '--ssh_host',
+                    <Object>,
+                    '--ssh_port',
+                    <Object>,
+                    '--board',
+                    'link',
+                    '--flavor',
+                    'chromeos',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-ChromeOS-Link-HD4000-x86_64-Release b/tools/tests/factory_configuration/expected/Test-ChromeOS-Link-HD4000-x86_64-Release
index da01f1e..5e5d405 100644
--- a/tools/tests/factory_configuration/expected/Test-ChromeOS-Link-HD4000-x86_64-Release
+++ b/tools/tests/factory_configuration/expected/Test-ChromeOS-Link-HD4000-x86_64-Release
@@ -803,6 +803,66 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'chromeos',
+                    '--builder_name',
+                    'Test-ChromeOS-Link-HD4000-x86_64-Release',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'no_gpu',
+                    '--ssh_host',
+                    <Object>,
+                    '--ssh_port',
+                    <Object>,
+                    '--board',
+                    'link',
+                    '--flavor',
+                    'chromeos',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-ChromeOS-Link-HD4000-x86_64-Release-Trybot b/tools/tests/factory_configuration/expected/Test-ChromeOS-Link-HD4000-x86_64-Release-Trybot
index 9e41cd2..b28bcc5 100644
--- a/tools/tests/factory_configuration/expected/Test-ChromeOS-Link-HD4000-x86_64-Release-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-ChromeOS-Link-HD4000-x86_64-Release-Trybot
@@ -863,6 +863,66 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'chromeos',
+                    '--builder_name',
+                    'Test-ChromeOS-Link-HD4000-x86_64-Release-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'no_gpu',
+                    '--ssh_host',
+                    <Object>,
+                    '--ssh_port',
+                    <Object>,
+                    '--board',
+                    'link',
+                    '--flavor',
+                    'chromeos',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Linux-Bare-NoGPU-Arm64-Debug b/tools/tests/factory_configuration/expected/Test-Linux-Bare-NoGPU-Arm64-Debug
index 21b6edd..464e1f9 100644
--- a/tools/tests/factory_configuration/expected/Test-Linux-Bare-NoGPU-Arm64-Debug
+++ b/tools/tests/factory_configuration/expected/Test-Linux-Bare-NoGPU-Arm64-Debug
@@ -803,6 +803,66 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'barelinux',
+                    '--builder_name',
+                    'Test-Linux-Bare-NoGPU-Arm64-Debug',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'no_gpu',
+                    '--ssh_host',
+                    <Object>,
+                    '--ssh_port',
+                    <Object>,
+                    '--ssh_user',
+                    <Object>,
+                    '--flavor',
+                    'arm64model',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Linux-Bare-NoGPU-Arm64-Debug-Trybot b/tools/tests/factory_configuration/expected/Test-Linux-Bare-NoGPU-Arm64-Debug-Trybot
index bd56be9..eb81fd1 100644
--- a/tools/tests/factory_configuration/expected/Test-Linux-Bare-NoGPU-Arm64-Debug-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Linux-Bare-NoGPU-Arm64-Debug-Trybot
@@ -863,6 +863,66 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'barelinux',
+                    '--builder_name',
+                    'Test-Linux-Bare-NoGPU-Arm64-Debug-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'no_gpu',
+                    '--ssh_host',
+                    <Object>,
+                    '--ssh_port',
+                    <Object>,
+                    '--ssh_user',
+                    <Object>,
+                    '--flavor',
+                    'arm64model',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug b/tools/tests/factory_configuration/expected/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug
index a110e2a..d4b32c5 100644
--- a/tools/tests/factory_configuration/expected/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug
+++ b/tools/tests/factory_configuration/expected/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug
@@ -726,6 +726,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'mac',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug-Trybot b/tools/tests/factory_configuration/expected/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug-Trybot
index 14ba072..1d6c97b 100644
--- a/tools/tests/factory_configuration/expected/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug-Trybot
@@ -780,6 +780,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'mac',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release b/tools/tests/factory_configuration/expected/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release
index 00356d6..87481f4 100644
--- a/tools/tests/factory_configuration/expected/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release
+++ b/tools/tests/factory_configuration/expected/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release
@@ -726,6 +726,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'mac',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release-Trybot b/tools/tests/factory_configuration/expected/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release-Trybot
index 3cbcbce..59558b1 100644
--- a/tools/tests/factory_configuration/expected/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release-Trybot
@@ -780,6 +780,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'mac',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug b/tools/tests/factory_configuration/expected/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug
index 6c720fb..40d7ab6 100644
--- a/tools/tests/factory_configuration/expected/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug
+++ b/tools/tests/factory_configuration/expected/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug
@@ -726,6 +726,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'mac',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug-Trybot b/tools/tests/factory_configuration/expected/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug-Trybot
index 06ee79c..0b5d922 100644
--- a/tools/tests/factory_configuration/expected/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug-Trybot
@@ -780,6 +780,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'mac',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release b/tools/tests/factory_configuration/expected/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release
index 5ac8921..272e50a 100644
--- a/tools/tests/factory_configuration/expected/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release
+++ b/tools/tests/factory_configuration/expected/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release
@@ -726,6 +726,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'mac',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release-Trybot b/tools/tests/factory_configuration/expected/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release-Trybot
index df27776..40f910e 100644
--- a/tools/tests/factory_configuration/expected/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release-Trybot
@@ -780,6 +780,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'mac',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Debug b/tools/tests/factory_configuration/expected/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Debug
index 478a3bc..ceddea8 100644
--- a/tools/tests/factory_configuration/expected/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Debug
+++ b/tools/tests/factory_configuration/expected/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Debug
@@ -725,6 +725,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Mac10.7-MacMini4.1-GeForce320M-x86-Debug',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'mac',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Debug-Trybot b/tools/tests/factory_configuration/expected/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Debug-Trybot
index 5810537..88798c7 100644
--- a/tools/tests/factory_configuration/expected/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Debug-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Debug-Trybot
@@ -779,6 +779,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Mac10.7-MacMini4.1-GeForce320M-x86-Debug-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'mac',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release b/tools/tests/factory_configuration/expected/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release
index 3bd0d3d..c3144e9 100644
--- a/tools/tests/factory_configuration/expected/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release
+++ b/tools/tests/factory_configuration/expected/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release
@@ -725,6 +725,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'mac',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release-Trybot b/tools/tests/factory_configuration/expected/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release-Trybot
index 5b9389a..ad4d83a 100644
--- a/tools/tests/factory_configuration/expected/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release-Trybot
@@ -779,6 +779,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'mac',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug b/tools/tests/factory_configuration/expected/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug
index 04ce341..8a34cbf 100644
--- a/tools/tests/factory_configuration/expected/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug
+++ b/tools/tests/factory_configuration/expected/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug
@@ -725,6 +725,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'mac',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug-Trybot b/tools/tests/factory_configuration/expected/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug-Trybot
index 358aa05..089424c 100644
--- a/tools/tests/factory_configuration/expected/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug-Trybot
@@ -779,6 +779,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'mac',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release b/tools/tests/factory_configuration/expected/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release
index c14bb71..0546da8 100644
--- a/tools/tests/factory_configuration/expected/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release
+++ b/tools/tests/factory_configuration/expected/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release
@@ -725,6 +725,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'mac',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release-Trybot b/tools/tests/factory_configuration/expected/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release-Trybot
index 262ee87..9a00270 100644
--- a/tools/tests/factory_configuration/expected/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release-Trybot
@@ -779,6 +779,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'mac',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug b/tools/tests/factory_configuration/expected/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug
index 643eab2..3fe29b3 100644
--- a/tools/tests/factory_configuration/expected/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug
+++ b/tools/tests/factory_configuration/expected/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug
@@ -725,6 +725,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'mac',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug-Trybot b/tools/tests/factory_configuration/expected/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug-Trybot
index d7a0d34..7889422 100644
--- a/tools/tests/factory_configuration/expected/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug-Trybot
@@ -779,6 +779,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'mac',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Release b/tools/tests/factory_configuration/expected/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Release
index e1e98f9..07e8b52 100644
--- a/tools/tests/factory_configuration/expected/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Release
+++ b/tools/tests/factory_configuration/expected/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Release
@@ -725,6 +725,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Mac10.8-MacMini4.1-GeForce320M-x86-Release',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'mac',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Release-Trybot b/tools/tests/factory_configuration/expected/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Release-Trybot
index 40cf70c..1928a24 100644
--- a/tools/tests/factory_configuration/expected/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Release-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Release-Trybot
@@ -779,6 +779,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Mac10.8-MacMini4.1-GeForce320M-x86-Release-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'mac',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug b/tools/tests/factory_configuration/expected/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug
index 71a5a3b..b7f63e2 100644
--- a/tools/tests/factory_configuration/expected/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug
+++ b/tools/tests/factory_configuration/expected/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug
@@ -725,6 +725,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'mac',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug-Trybot b/tools/tests/factory_configuration/expected/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug-Trybot
index bfcf4aa..96135c1 100644
--- a/tools/tests/factory_configuration/expected/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug-Trybot
@@ -779,6 +779,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'mac',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release b/tools/tests/factory_configuration/expected/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release
index 09032b1..40c64ae 100644
--- a/tools/tests/factory_configuration/expected/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release
+++ b/tools/tests/factory_configuration/expected/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release
@@ -726,6 +726,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'mac',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release-Trybot b/tools/tests/factory_configuration/expected/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release-Trybot
index de11216..5069ec6 100644
--- a/tools/tests/factory_configuration/expected/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release-Trybot
@@ -780,6 +780,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'mac',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug b/tools/tests/factory_configuration/expected/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug
index b905dab..47c1924 100644
--- a/tools/tests/factory_configuration/expected/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug
+++ b/tools/tests/factory_configuration/expected/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug
@@ -725,6 +725,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Ubuntu12-ShuttleA-GTX660-x86-Debug',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug-Trybot b/tools/tests/factory_configuration/expected/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug-Trybot
index efdcc09..01f888c 100644
--- a/tools/tests/factory_configuration/expected/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug-Trybot
@@ -779,6 +779,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Ubuntu12-ShuttleA-GTX660-x86-Debug-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Ubuntu12-ShuttleA-GTX660-x86-Release b/tools/tests/factory_configuration/expected/Test-Ubuntu12-ShuttleA-GTX660-x86-Release
index abcdb45..9871c69 100644
--- a/tools/tests/factory_configuration/expected/Test-Ubuntu12-ShuttleA-GTX660-x86-Release
+++ b/tools/tests/factory_configuration/expected/Test-Ubuntu12-ShuttleA-GTX660-x86-Release
@@ -725,6 +725,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Ubuntu12-ShuttleA-GTX660-x86-Release',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Ubuntu12-ShuttleA-GTX660-x86-Release-Trybot b/tools/tests/factory_configuration/expected/Test-Ubuntu12-ShuttleA-GTX660-x86-Release-Trybot
index 396d652..5fc037e 100644
--- a/tools/tests/factory_configuration/expected/Test-Ubuntu12-ShuttleA-GTX660-x86-Release-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Ubuntu12-ShuttleA-GTX660-x86-Release-Trybot
@@ -779,6 +779,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Ubuntu12-ShuttleA-GTX660-x86-Release-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Debug b/tools/tests/factory_configuration/expected/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Debug
index d6a4e10..033e576 100644
--- a/tools/tests/factory_configuration/expected/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Debug
+++ b/tools/tests/factory_configuration/expected/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Debug
@@ -725,6 +725,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Ubuntu12-ShuttleA-GTX660-x86_64-Debug',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Debug-Trybot b/tools/tests/factory_configuration/expected/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Debug-Trybot
index 30c58fe..69532d1 100644
--- a/tools/tests/factory_configuration/expected/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Debug-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Debug-Trybot
@@ -779,6 +779,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Ubuntu12-ShuttleA-GTX660-x86_64-Debug-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Release b/tools/tests/factory_configuration/expected/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Release
index ab58fe3..af9f4c5 100644
--- a/tools/tests/factory_configuration/expected/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Release
+++ b/tools/tests/factory_configuration/expected/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Release
@@ -725,6 +725,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Ubuntu12-ShuttleA-GTX660-x86_64-Release',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Release-Trybot b/tools/tests/factory_configuration/expected/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Release-Trybot
index 7e873b9..f27d10a 100644
--- a/tools/tests/factory_configuration/expected/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Release-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Release-Trybot
@@ -779,6 +779,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Ubuntu12-ShuttleA-GTX660-x86_64-Release-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Ubuntu13.10-GCE-NoGPU-x86_64-Debug-ASAN b/tools/tests/factory_configuration/expected/Test-Ubuntu13.10-GCE-NoGPU-x86_64-Debug-ASAN
index 7c0cb6f..3de7b7a 100644
--- a/tools/tests/factory_configuration/expected/Test-Ubuntu13.10-GCE-NoGPU-x86_64-Debug-ASAN
+++ b/tools/tests/factory_configuration/expected/Test-Ubuntu13.10-GCE-NoGPU-x86_64-Debug-ASAN
@@ -752,6 +752,62 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Ubuntu13.10-GCE-NoGPU-x86_64-Debug-ASAN',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--sanitizer',
+                    'address',
+                    '--flavor',
+                    'xsan',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Ubuntu13.10-GCE-NoGPU-x86_64-Debug-ASAN-Trybot b/tools/tests/factory_configuration/expected/Test-Ubuntu13.10-GCE-NoGPU-x86_64-Debug-ASAN-Trybot
index 8b7922f..b572f1c 100644
--- a/tools/tests/factory_configuration/expected/Test-Ubuntu13.10-GCE-NoGPU-x86_64-Debug-ASAN-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Ubuntu13.10-GCE-NoGPU-x86_64-Debug-ASAN-Trybot
@@ -808,6 +808,62 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Ubuntu13.10-GCE-NoGPU-x86_64-Debug-ASAN-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--sanitizer',
+                    'address',
+                    '--flavor',
+                    'xsan',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Ubuntu13.10-ShuttleA-NoGPU-x86_64-Debug b/tools/tests/factory_configuration/expected/Test-Ubuntu13.10-ShuttleA-NoGPU-x86_64-Debug
index b2c2c11..7a6989a 100644
--- a/tools/tests/factory_configuration/expected/Test-Ubuntu13.10-ShuttleA-NoGPU-x86_64-Debug
+++ b/tools/tests/factory_configuration/expected/Test-Ubuntu13.10-ShuttleA-NoGPU-x86_64-Debug
@@ -726,6 +726,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Ubuntu13.10-ShuttleA-NoGPU-x86_64-Debug',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Ubuntu13.10-ShuttleA-NoGPU-x86_64-Debug-Trybot b/tools/tests/factory_configuration/expected/Test-Ubuntu13.10-ShuttleA-NoGPU-x86_64-Debug-Trybot
index 42e56f9..d2b9a6d 100644
--- a/tools/tests/factory_configuration/expected/Test-Ubuntu13.10-ShuttleA-NoGPU-x86_64-Debug-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Ubuntu13.10-ShuttleA-NoGPU-x86_64-Debug-Trybot
@@ -780,6 +780,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '../../../../../../slave/skia_slave_scripts/run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Ubuntu13.10-ShuttleA-NoGPU-x86_64-Debug-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'linux',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build/skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '../../../../../../slave/skia_slave_scripts/run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Debug b/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Debug
index 532dbcc..0536816 100644
--- a/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Debug
+++ b/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Debug
@@ -727,6 +727,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '..\..\..\..\..\..\slave\skia_slave_scripts\run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Win7-ShuttleA-HD2000-x86-Debug',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'win32',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build\skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '..\..\..\..\..\..\slave\skia_slave_scripts\run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE b/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE
index 6d539e2..87c4bb2 100644
--- a/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE
+++ b/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE
@@ -728,6 +728,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '..\..\..\..\..\..\slave\skia_slave_scripts\run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'win32',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '"--config ANGLE"',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'angle',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build\skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '..\..\..\..\..\..\slave\skia_slave_scripts\run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE-Trybot b/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE-Trybot
index 9413683..cd07c78 100644
--- a/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE-Trybot
@@ -782,6 +782,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '..\..\..\..\..\..\slave\skia_slave_scripts\run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'win32',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '"--config ANGLE"',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'angle',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build\skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '..\..\..\..\..\..\slave\skia_slave_scripts\run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Debug-DirectWrite b/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Debug-DirectWrite
index 390b90e..fa822f4 100644
--- a/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Debug-DirectWrite
+++ b/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Debug-DirectWrite
@@ -728,6 +728,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '..\..\..\..\..\..\slave\skia_slave_scripts\run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Win7-ShuttleA-HD2000-x86-Debug-DirectWrite',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'win32',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build\skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '..\..\..\..\..\..\slave\skia_slave_scripts\run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Debug-DirectWrite-Trybot b/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Debug-DirectWrite-Trybot
index 719c636..b60269d 100644
--- a/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Debug-DirectWrite-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Debug-DirectWrite-Trybot
@@ -782,6 +782,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '..\..\..\..\..\..\slave\skia_slave_scripts\run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Win7-ShuttleA-HD2000-x86-Debug-DirectWrite-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'win32',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build\skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '..\..\..\..\..\..\slave\skia_slave_scripts\run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Debug-Trybot b/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Debug-Trybot
index 9956a53..9a3a687 100644
--- a/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Debug-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Debug-Trybot
@@ -781,6 +781,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '..\..\..\..\..\..\slave\skia_slave_scripts\run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Win7-ShuttleA-HD2000-x86-Debug-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'win32',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build\skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '..\..\..\..\..\..\slave\skia_slave_scripts\run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Release b/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Release
index 0134254..43d6e7c 100644
--- a/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Release
+++ b/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Release
@@ -727,6 +727,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '..\..\..\..\..\..\slave\skia_slave_scripts\run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Win7-ShuttleA-HD2000-x86-Release',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'win32',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build\skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '..\..\..\..\..\..\slave\skia_slave_scripts\run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE b/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE
index 4e6ae15..c9f0545 100644
--- a/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE
+++ b/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE
@@ -728,6 +728,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '..\..\..\..\..\..\slave\skia_slave_scripts\run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'win32',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '"--config ANGLE"',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'angle',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build\skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '..\..\..\..\..\..\slave\skia_slave_scripts\run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE-Trybot b/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE-Trybot
index 94e0fb9..22e349c 100644
--- a/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE-Trybot
@@ -782,6 +782,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '..\..\..\..\..\..\slave\skia_slave_scripts\run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'win32',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '"--config ANGLE"',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'angle',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build\skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '..\..\..\..\..\..\slave\skia_slave_scripts\run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite b/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite
index 32a7822..f736300 100644
--- a/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite
+++ b/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite
@@ -728,6 +728,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '..\..\..\..\..\..\slave\skia_slave_scripts\run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'win32',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build\skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '..\..\..\..\..\..\slave\skia_slave_scripts\run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite-Trybot b/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite-Trybot
index d96c906..a3116e7 100644
--- a/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite-Trybot
@@ -782,6 +782,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '..\..\..\..\..\..\slave\skia_slave_scripts\run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'win32',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build\skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '..\..\..\..\..\..\slave\skia_slave_scripts\run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Release-Trybot b/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Release-Trybot
index 4f4f338..71a9dc3 100644
--- a/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Release-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86-Release-Trybot
@@ -781,6 +781,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '..\..\..\..\..\..\slave\skia_slave_scripts\run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Win7-ShuttleA-HD2000-x86-Release-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'win32',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build\skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '..\..\..\..\..\..\slave\skia_slave_scripts\run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86_64-Debug b/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86_64-Debug
index e340e57..a1db84d 100644
--- a/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86_64-Debug
+++ b/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86_64-Debug
@@ -727,6 +727,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '..\..\..\..\..\..\slave\skia_slave_scripts\run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Win7-ShuttleA-HD2000-x86_64-Debug',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'win32',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build\skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '..\..\..\..\..\..\slave\skia_slave_scripts\run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86_64-Debug-Trybot b/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86_64-Debug-Trybot
index ca273ed..aafb870 100644
--- a/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86_64-Debug-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86_64-Debug-Trybot
@@ -781,6 +781,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '..\..\..\..\..\..\slave\skia_slave_scripts\run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Win7-ShuttleA-HD2000-x86_64-Debug-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'win32',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build\skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '..\..\..\..\..\..\slave\skia_slave_scripts\run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86_64-Release b/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86_64-Release
index d926f0b..e976666 100644
--- a/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86_64-Release
+++ b/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86_64-Release
@@ -727,6 +727,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '..\..\..\..\..\..\slave\skia_slave_scripts\run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Win7-ShuttleA-HD2000-x86_64-Release',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'win32',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build\skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '..\..\..\..\..\..\slave\skia_slave_scripts\run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86_64-Release-Trybot b/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86_64-Release-Trybot
index aa179eb..44b1c65 100644
--- a/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86_64-Release-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Win7-ShuttleA-HD2000-x86_64-Release-Trybot
@@ -781,6 +781,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '..\..\..\..\..\..\slave\skia_slave_scripts\run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Win7-ShuttleA-HD2000-x86_64-Release-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'win32',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'default',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build\skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '..\..\..\..\..\..\slave\skia_slave_scripts\run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-GTX660-x86-Debug b/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-GTX660-x86-Debug
index 0b82be4..3cc4a9e 100644
--- a/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-GTX660-x86-Debug
+++ b/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-GTX660-x86-Debug
@@ -727,6 +727,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '..\..\..\..\..\..\slave\skia_slave_scripts\run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Win8-ShuttleA-GTX660-x86-Debug',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'win32',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'default_msaa16',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build\skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '..\..\..\..\..\..\slave\skia_slave_scripts\run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-GTX660-x86-Debug-Trybot b/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-GTX660-x86-Debug-Trybot
index 2a4faeb..cd390f4 100644
--- a/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-GTX660-x86-Debug-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-GTX660-x86-Debug-Trybot
@@ -781,6 +781,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '..\..\..\..\..\..\slave\skia_slave_scripts\run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Win8-ShuttleA-GTX660-x86-Debug-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'win32',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'default_msaa16',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build\skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '..\..\..\..\..\..\slave\skia_slave_scripts\run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-GTX660-x86-Release b/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-GTX660-x86-Release
index 5d2e0cb..41bc2de 100644
--- a/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-GTX660-x86-Release
+++ b/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-GTX660-x86-Release
@@ -727,6 +727,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '..\..\..\..\..\..\slave\skia_slave_scripts\run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Win8-ShuttleA-GTX660-x86-Release',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'win32',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'default_msaa16',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build\skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '..\..\..\..\..\..\slave\skia_slave_scripts\run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-GTX660-x86-Release-Trybot b/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-GTX660-x86-Release-Trybot
index f1ed69c..2ba9292 100644
--- a/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-GTX660-x86-Release-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-GTX660-x86-Release-Trybot
@@ -781,6 +781,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '..\..\..\..\..\..\slave\skia_slave_scripts\run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Win8-ShuttleA-GTX660-x86-Release-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'win32',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'default_msaa16',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build\skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '..\..\..\..\..\..\slave\skia_slave_scripts\run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-GTX660-x86_64-Debug b/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-GTX660-x86_64-Debug
index d5833ee..fdd3ca9 100644
--- a/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-GTX660-x86_64-Debug
+++ b/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-GTX660-x86_64-Debug
@@ -727,6 +727,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '..\..\..\..\..\..\slave\skia_slave_scripts\run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Win8-ShuttleA-GTX660-x86_64-Debug',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'win32',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'default_msaa16',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build\skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '..\..\..\..\..\..\slave\skia_slave_scripts\run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-GTX660-x86_64-Debug-Trybot b/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-GTX660-x86_64-Debug-Trybot
index 8d6e573..97d0aac 100644
--- a/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-GTX660-x86_64-Debug-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-GTX660-x86_64-Debug-Trybot
@@ -781,6 +781,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '..\..\..\..\..\..\slave\skia_slave_scripts\run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Win8-ShuttleA-GTX660-x86_64-Debug-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'win32',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'default_msaa16',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build\skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '..\..\..\..\..\..\slave\skia_slave_scripts\run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-GTX660-x86_64-Release b/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-GTX660-x86_64-Release
index 875ee36..6b5565b 100644
--- a/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-GTX660-x86_64-Release
+++ b/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-GTX660-x86_64-Release
@@ -727,6 +727,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '..\..\..\..\..\..\slave\skia_slave_scripts\run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Win8-ShuttleA-GTX660-x86_64-Release',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'win32',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'default_msaa16',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build\skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '..\..\..\..\..\..\slave\skia_slave_scripts\run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-GTX660-x86_64-Release-Trybot b/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-GTX660-x86_64-Release-Trybot
index c706b2a..990e80d 100644
--- a/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-GTX660-x86_64-Release-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-GTX660-x86_64-Release-Trybot
@@ -781,6 +781,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '..\..\..\..\..\..\slave\skia_slave_scripts\run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Win8-ShuttleA-GTX660-x86_64-Release-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'win32',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'default_msaa16',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build\skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '..\..\..\..\..\..\slave\skia_slave_scripts\run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-HD7770-x86-Debug b/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-HD7770-x86-Debug
index df46980..2ce5db3 100644
--- a/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-HD7770-x86-Debug
+++ b/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-HD7770-x86-Debug
@@ -727,6 +727,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '..\..\..\..\..\..\slave\skia_slave_scripts\run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Win8-ShuttleA-HD7770-x86-Debug',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'win32',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'default_msaa16',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build\skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '..\..\..\..\..\..\slave\skia_slave_scripts\run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-HD7770-x86-Debug-Trybot b/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-HD7770-x86-Debug-Trybot
index 2e3185b..5f079f1 100644
--- a/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-HD7770-x86-Debug-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-HD7770-x86-Debug-Trybot
@@ -781,6 +781,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '..\..\..\..\..\..\slave\skia_slave_scripts\run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Win8-ShuttleA-HD7770-x86-Debug-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'win32',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'default_msaa16',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build\skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '..\..\..\..\..\..\slave\skia_slave_scripts\run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-HD7770-x86-Release b/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-HD7770-x86-Release
index dad9d8e..09f0ffc 100644
--- a/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-HD7770-x86-Release
+++ b/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-HD7770-x86-Release
@@ -727,6 +727,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '..\..\..\..\..\..\slave\skia_slave_scripts\run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Win8-ShuttleA-HD7770-x86-Release',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'win32',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'default_msaa16',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build\skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '..\..\..\..\..\..\slave\skia_slave_scripts\run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-HD7770-x86-Release-Trybot b/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-HD7770-x86-Release-Trybot
index 34133aa..535e0ea 100644
--- a/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-HD7770-x86-Release-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-HD7770-x86-Release-Trybot
@@ -781,6 +781,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '..\..\..\..\..\..\slave\skia_slave_scripts\run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Win8-ShuttleA-HD7770-x86-Release-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'win32',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'default_msaa16',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build\skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '..\..\..\..\..\..\slave\skia_slave_scripts\run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-HD7770-x86_64-Debug b/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-HD7770-x86_64-Debug
index 5dc6727..56f4879 100644
--- a/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-HD7770-x86_64-Debug
+++ b/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-HD7770-x86_64-Debug
@@ -727,6 +727,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '..\..\..\..\..\..\slave\skia_slave_scripts\run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Win8-ShuttleA-HD7770-x86_64-Debug',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'win32',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'default_msaa16',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build\skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '..\..\..\..\..\..\slave\skia_slave_scripts\run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-HD7770-x86_64-Debug-Trybot b/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-HD7770-x86_64-Debug-Trybot
index ab91a64..b9540c6 100644
--- a/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-HD7770-x86_64-Debug-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-HD7770-x86_64-Debug-Trybot
@@ -781,6 +781,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '..\..\..\..\..\..\slave\skia_slave_scripts\run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Debug',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Win8-ShuttleA-HD7770-x86_64-Debug-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'win32',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'default_msaa16',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build\skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '..\..\..\..\..\..\slave\skia_slave_scripts\run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-HD7770-x86_64-Release b/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-HD7770-x86_64-Release
index b3e5649..a3e1b9a 100644
--- a/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-HD7770-x86_64-Release
+++ b/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-HD7770-x86_64-Release
@@ -727,6 +727,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '..\..\..\..\..\..\slave\skia_slave_scripts\run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Win8-ShuttleA-HD7770-x86_64-Release',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'win32',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'False',
+                    '--bench_pictures_cfg',
+                    'default_msaa16',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build\skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '..\..\..\..\..\..\slave\skia_slave_scripts\run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',
diff --git a/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-HD7770-x86_64-Release-Trybot b/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-HD7770-x86_64-Release-Trybot
index f37536f..8b269d5 100644
--- a/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-HD7770-x86_64-Release-Trybot
+++ b/tools/tests/factory_configuration/expected/Test-Win8-ShuttleA-HD7770-x86_64-Release-Trybot
@@ -781,6 +781,60 @@
                 'alwaysRun': <Object>,
                 'command': [
                     'python',
+                    '..\..\..\..\..\..\slave\skia_slave_scripts\run_dm.py',
+                    '--autogen_svn_baseurl',
+                    'bogusValueToFixSkBug2663',
+                    '--configuration',
+                    'Release',
+                    '--deps_target_os',
+                    'None',
+                    '--builder_name',
+                    'Test-Win8-ShuttleA-HD7770-x86_64-Release-Trybot',
+                    '--build_number',
+                    <Object>,
+                    '--target_platform',
+                    'win32',
+                    '--revision',
+                    <Object>,
+                    '--got_revision',
+                    <Object>,
+                    '--perf_output_basedir',
+                    'None',
+                    '--make_flags',
+                    '""',
+                    '--test_args',
+                    '""',
+                    '--gm_args',
+                    '""',
+                    '--bench_args',
+                    '""',
+                    '--is_try',
+                    'True',
+                    '--bench_pictures_cfg',
+                    'default_msaa16',
+                    '--flavor',
+                    'default',
+                ],
+                'description': 'RunDM',
+                'doStepIf': <Object>,
+                'env': {},
+                'exception_on_failure': <Object>,
+                'flunkOnFailure': <Object>,
+                'get_props_from_stdout': None,
+                'haltOnFailure': <Object>,
+                'hideStepIf': <Object>,
+                'is_rebaseline_step': <Object>,
+                'is_upload_step': <Object>,
+                'timeout': <Object>,
+                'workdir': 'build\skia',
+            },
+        ],
+        [
+            <Object>,
+            {
+                'alwaysRun': <Object>,
+                'command': [
+                    'python',
                     '..\..\..\..\..\..\slave\skia_slave_scripts\run_gm.py',
                     '--autogen_svn_baseurl',
                     'bogusValueToFixSkBug2663',