Add testing library to running tests.

scripts/slave/runtest.py

Index: scripts/slave/runtest.py
===================================================================
--- scripts/slave/runtest.py	(revision 125389)
+++ 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,11 @@
 
 
 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,
@@ -486,8 +496,14 @@
   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_true', default=True,

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

I don't care enough to block you but I think it just adds noise. Either you use
the default or you don't. It makes both the implementation and users simpler
since there can't be conflicting flags on the command line.

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

I think you are right that a single variable makes the implementation cleaner. 
Done.  Each of the three clear options are then at best redundant, and usually
contradictory.  

+                           help='Use software gpu pipe directory.')
+  option_parser.add_option('', '--no-llvmpipe', action='store_false',
+                           dest='llvmpipe',
+                           help='Do not use software gpu pipe directory.')
+  option_parser.add_option('', '--llvmpipe-dir', default=xvfb_path,
+                           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',