Add testing library to running tests.

scripts/slave/runtest.py

Index: scripts/slave/runtest.py
===================================================================
--- scripts/slave/runtest.py	(revision 125116)
+++ scripts/slave/runtest.py	(working copy)
@@ -314,6 +314,11 @@
 
   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 and 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',
@@ -439,6 +444,8 @@
 
 
 def main():
+  import platform
+
   # Initialize logging.
   log_level = logging.INFO
   logging.basicConfig(level=log_level,
@@ -486,9 +493,19 @@
   option_parser.add_option('', '--parallel', action='store_true',
                            help='Shard and run tests in parallel for speed '
                                 'with sharding_supervisor.')
+  option_parser.add_option('', '--llvmpipe', action='store_true',
+      default=True, help='Use software gpu pipe directory.')
+  option_parser.add_option('', '--no-llvmpipe', action='store_false',
+      default=False, dest='llvmpipe',
+      help='Do not use software gpu pipe directory.')
+  option_parser.add_option('', '--llvmpipe-dir', default=os.path.join(
+      os.path.dirname(sys.argv[0]), '..', '..', 'third_party', 'xvfb',
+      platform.architecture()[0]),
+      help='Path to software gpu library directory.')
   option_parser.add_option('', '--special-xvfb-dir', default=os.path.join(
-                             os.path.dirname(sys.argv[0]), '..', '..', 'xvfb'),
-                           help='Path to virtual X server directory on Linux.')
+      os.path.dirname(sys.argv[0]), '..', '..', 'third_party', 'xvfb',
+      platform.architecture()[0]),
+      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.')
@@ -498,11 +515,6 @@
   option_parser.add_option('', '--auto-special-xvfb', action='store_const',
                            const='auto', dest='special_xvfb',
                            help='Guess as to virtual X server on Linux.')
-  option_parser.add_option('', '--xvfb', action='store_true', dest='xvfb',
-                           default=True,
-                           help='Start virtual X server on Linux.')
-  option_parser.add_option('', '--no-xvfb', action='store_false', dest='xvfb',
-                           help='Do not start virtual X server on Linux.')
   option_parser.add_option('', '--sharding-args', dest='sharding_args',
                            default=None,
                            help='Options to pass to sharding_supervisor.')