Add ability to pass a base test root and create results dirs relative.

bin/au_test_harness/cros_au_test_harness.py

 #!/usr/bin/python
 
 # Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """This module runs a suite of Auto Update tests.
 
   The tests can be run on either a virtual machine or actual device depending
   on parameters given.  Specific tests can be run by invoking --test_prefix.
@@ skipping 219 matching lines @@
   parser.add_option('--public_key', default=None,
                      help='Public key to use on images and updates.')
   parser.add_option('--private_key', default=None,
                      help='Private key to use on images and updates.')
   parser.add_option('-q', '--quick_test', default=False, action='store_true',
                     help='Use a basic test to verify image.')
   parser.add_option('-m', '--remote',
                     help='Remote address for real test.')
   parser.add_option('-t', '--target_image',
                     help='path to the target image.')
+  parser.add_option('--test_results_root', default=None,
+                    help='Root directory to store test results.  Should '
+                         'be defined relative to chroot root.')
   parser.add_option('--test_prefix', default='test',
                     help='Only runs tests with specific prefix i.e. '
                          'testFullUpdateWipeStateful.')
   parser.add_option('-p', '--type', default='vm',
                     help='type of test to run: [vm, real]. Default: vm.')
   parser.add_option('--verbose', default=True, action='store_true',
                     help='Print out rather than capture output as much as '
                          'possible.')
   (options, leftover_args) = parser.parse_args()
 
-  if leftover_args: parser.error('Found unsupported flags: %s' % leftover_args)
+  if leftover_args: parser.error('Found unsupported flags: % s' % leftover_args)

[dgarrett, 2011/03/04 22:31:12]

I think that space is put there by mistake, though it seems to have no effect
for non-integers.

 
   assert options.target_image and os.path.exists(options.target_image), \
     'Target image path does not exist'
   if not options.base_image:
     cros_lib.Info('Base image not specified.  Using target as base image.')
     options.base_image = options.target_image
 
   # Sanity checks on keys and insert them onto the image.  The caches must be
   # cleaned so we know that the vm images and payloads match the possibly new
   # key.
   if options.private_key or options.public_key:
-    error_msg = ('Could not find %s key.  Both private and public keys must be '
+    error_msg = ('Could not find % s key.  Both private and public keys must be '

[dgarrett, 2011/03/04 22:31:12]

80 characters, the space looks like an error, and there is nothing %'d into the
%s anyway.

                  'specified if either is specified.')
     assert options.private_key and os.path.exists(options.private_key), \
         error_msg % 'private'
     assert options.public_key and os.path.exists(options.public_key), \
         error_msg % 'public'
     _InsertPublicKeyIntoImage(options.target_image, options.public_key)
     if options.target_image != options.base_image:
       _InsertPublicKeyIntoImage(options.base_image, options.public_key)
     options.clean = True
 
@@ skipping 14 matching lines @@
       # Can't run in parallel with only one remote device.
       test_suite = _PrepareTestSuite(options)
       test_result = unittest.TextTestRunner(verbosity=2).run(test_suite)
       if not test_result.wasSuccessful(): cros_lib.Die('Test harness failed.')
   finally:
     my_server.Stop()
 
 
 if __name__ == '__main__':
   main()