Add testing library to running tests.

scripts/slave/runtest.py

Index: scripts/slave/runtest.py
===================================================================
--- scripts/slave/runtest.py	(revision 125221)
+++ 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

[Marc-Antoine Ruel (Google), 2012/03/06 23:38:03]

Why function local?

[Peter Mayo, 2012/03/07 16:22:48]

Conflict with line 132 variable name.  This seemed cleaner than refactoring that
interface.

+
   # 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',

[Marc-Antoine Ruel (Google), 2012/03/06 23:38:03]

Why add this flag at all?

[Peter Mayo, 2012/03/07 16:22:48]

i) I don't believe in adding options that don't have inverses, and no-llvmpipe
seems prudent.
ii) I like having defaults that are just 'right' almost all the time. 
Specifying the correct arch directory in all of the call sites seems like
distributing the business logic to much.

hence no-args:  the usual llvmpipe directory.
   --llvmpipe:  the usual directory.
--no-llvmpipe:  nothing weird in LD_LIBRARY_PATH
--lvmpipe-dir:  weird directory in LD_LIBRARY_PATH

+      default=True, help='Use software gpu pipe directory.')
+  option_parser.add_option('', '--no-llvmpipe', action='store_false',
+      default=False, dest='llvmpipe',

[Peter Mayo, 2012/03/07 16:22:48]

Contradictory defaults.

+      help='Do not use software gpu pipe directory.')
+  option_parser.add_option('', '--llvmpipe-dir', default=os.path.join(

[Marc-Antoine Ruel (Google), 2012/03/06 23:38:03]

Shouldn't just specifying --lvmpipe-dir enable it?
Also, alignment

[Peter Mayo, 2012/03/07 16:22:48]

I'd like to leave that to the person who implements default=False for llvmpipe.
The function-argument alignment starts to look bad with these lengths & nesting.
Refactored the path out.  It is easier to read.

+      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.')