Add testing library to running tests.

scripts/master/factory/chromium_commands.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Set of utilities to add commands to a buildbot factory.
 
 This is based on commands.py and adds chromium-specific commands."""
 
 import logging
 import os
@@ skipping 920 matching lines @@
            # use the latest build.  Instead we should trigger on the
            # presence of new build and pass that info down for a
            # --build N arg.
            '--latest']
     if branch:  # Fetch latest on given branch
       cmd += ['--branch', str(branch)]
     self.AddTestStep(commands.WaterfallLoggingShellCommand,
                      'Download and extract official build', cmd,
                      halt_on_failure=True)
 
+  def AddSoftGpuTests(self, factory_properties):
+    """Runs gpu_tests with software rendering and archives any results.
+    """
+    # Put gpu data in /b/build/slave/SLAVE_NAME/gpu_data

[M-A Ruel, 2012/03/07 20:29:44]

Do you want to keep this comment?

[Peter Mayo, 2012/03/08 21:17:35]

These were a hook to the key open question of where the test expectations come
from, and where failures get saved:  There is no correct value for these as of
yet.

+    # gen_dir = self.PathJoin('..', 'soft_gpu_data', 'generated')
+    # ref_dir = self.PathJoin('..', 'gpu_data', 'reference')
+
+    tests = ':'.join(['GpuPixelBrowserTest.*', 'GpuFeatureTest.*',
+                      'Canvas2DPixelTestSD.*', 'Canvas2DPixelTestHD.*'])
+    # 'GPUCrashTest.*', while interesting, fails.
+
+    self.AddBasicGTestTestStep('gpu_tests', factory_properties,
+        description='(soft)',
+        arg_list=['--gtest_also_run_disabled_tests',
+                  # '--generated-dir=%s' % gen_dir,

[M-A Ruel, 2012/03/07 20:29:44]

same

[Peter Mayo, 2012/03/08 21:17:35]

Done.

+                  # '--reference-dir=%s' % ref_dir,
+                  '--gtest_filter=%s' % tests],
+        test_tool_arg_list=['--llvmpipe'])
+
+    # Note: we aren't archiving these for the moment.
+
   def AddGpuTests(self, factory_properties):
     """Runs gpu_tests binary and archives any results.
 
     This binary contains all the tests that should be run on the gpu bots.
     """
     # Put gpu data in /b/build/slave/SLAVE_NAME/gpu_data
     gpu_data = self.PathJoin('..', 'gpu_data')
     gen_dir = self.PathJoin(gpu_data, 'generated')
     ref_dir = self.PathJoin(gpu_data, 'reference')
 
@@ skipping 73 matching lines @@
   # ArchiveCommand.createSummary.
   return '%s/%s/%s' % (config.Master.archive_url, archive_type, builder_name)
 
 def _GetSnapshotUrl(factory_properties=None, builder_name='%(build_name)s'):
   if not factory_properties or 'gs_bucket' not in factory_properties:
     return (_GetArchiveUrl('snapshots', builder_name), None)
   gs_bucket = factory_properties['gs_bucket']
   gs_bucket = re.sub(r'^gs://', 'http://commondatastorage.googleapis.com/',
                      gs_bucket)
   return ('%s/index.html?path=%s' % (gs_bucket, builder_name), '/')