Add testing library to running tests.

scripts/slave/runtest.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """A tool to run a chrome test executable, used by the buildbot slaves.
 
   When this is run, the current directory (cwd) should be the outer build
   directory (e.g., chrome-release/build/).
 
@@ skipping 297 matching lines @@
   # file attributes), and we'd rather have no sandbox than pull in an old
   # (possibly incompatible) one from the system.
   os.environ['CHROME_DEVEL_SANDBOX'] = ''
 
   # Nuke anything that appears to be stale chrome items in the temporary
   # directory from previous test runs (i.e.- from crashes or unittest leaks).
   slave_utils.RemoveChromeTemporaryFiles()
 
   os.environ['LD_LIBRARY_PATH'] = '%s:%s/lib:%s/lib.target' % (bin_dir, bin_dir,
                                                                bin_dir)
+  # Figure out what we want for a special llvmpipe directory.
+  if (options.llvmpipe_dir and os.path.exists(options.llvmpipe_dir)):
+    os.environ['LD_LIBRARY_PATH'] += ':' + options.llvmpipe_dir
+
   if options.parallel:
     supervisor_path = os.path.join(build_dir, '..', 'tools',
                                    'sharding_supervisor',
                                    'sharding_supervisor.py')
     supervisor_args = ['--no-color', '--retry-failed']
     if options.sharding_args:
       supervisor_args.extend(options.sharding_args.split())
     command = [sys.executable, supervisor_path]
     command.extend(supervisor_args)
     command.append(test_exe_path)
@@ skipping 105 matching lines @@
   if options.enable_pageheap:
     slave_utils.SetPageHeap(build_dir, 'chrome.exe', False)
 
   if options.generate_json_file:
     _GenerateJSONForTestResults(options, results_tracker)
 
   return result
 
 
 def main():
+  import platform
+
+  xvfb_path = os.path.join(os.path.dirname(sys.argv[0]), '..', '..',
+                           'third_party', 'xvfb', platform.architecture()[0])
+
   # Initialize logging.
   log_level = logging.INFO
   logging.basicConfig(level=log_level,
                       format='%(asctime)s %(filename)s:%(lineno)-3d'
                              ' %(levelname)s %(message)s',
                       datefmt='%y%m%d %H:%M:%S')
 
   option_parser = optparse.OptionParser(usage=USAGE)
 
   # Since the trailing program to run may have has command-line args of its
@@ skipping 27 matching lines @@
   option_parser.add_option('', '--run-python-script', action='store_true',
                            default=False,
                            help='treat first argument as a python script'
                                 'to run.')
   option_parser.add_option('', '--generate-json-file', action='store_true',
                            default=False,
                            help='output JSON results file if specified.')
   option_parser.add_option('', '--parallel', action='store_true',
                            help='Shard and run tests in parallel for speed '
                                 'with sharding_supervisor.')
-  option_parser.add_option('', '--special-xvfb-dir', default=os.path.join(
-                             os.path.dirname(sys.argv[0]), '..', '..', 'xvfb'),
+  option_parser.add_option('', '--llvmpipe', action='store_const',
+                           value=xvfb_path, dest='llvmpipe_dir',
+                           help='Use software gpu pipe directory.')
+  option_parser.add_option('', '--no-llvmpipe', action='store_false',
+                           value=None, dest='llvmpipe_dir',
+                           help='Do not use software gpu pipe directory.')
+  option_parser.add_option('', '--llvmpipe-dir',
+                           default=None, dest='llvmpipe_dir',
+                           help='Path to software gpu library directory.')
+  option_parser.add_option('', '--special-xvfb-dir', default=xvfb_path,
                            help='Path to virtual X server directory on Linux.')
   option_parser.add_option('', '--special-xvfb', action='store_true',
                            default='auto',
                            help='use non-default virtual X server on Linux.')
   option_parser.add_option('', '--no-special-xvfb', action='store_false',
                            dest='special_xvfb',
                            help='Use default virtual X server on Linux.')
   option_parser.add_option('', '--auto-special-xvfb', action='store_const',
                            const='auto', dest='special_xvfb',
                            help='Guess as to virtual X server on Linux.')
@@ skipping 72 matching lines @@
         '%d new files were left in %s: Fix the tests to clean up themselves.'
         ) % ((new_temp_files - temp_files), tempfile.gettempdir())
     # TODO(maruel): Make it an error soon. Not yet since I want to iron out all
     # the remaining cases before.
     #result = 1
   return result
 
 
 if '__main__' == __name__:
   sys.exit(main())