Fixes for cbuild to work with ctest.

bin/ctest.py

 #!/usr/bin/python
 #
 # Copyright (c) 2010 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.
 
 """Wrapper for tests that are run on builders."""
 
 import fileinput
 import optparse
@@ skipping 109 matching lines @@
                print_cmd=False, error_message='Failed to download %s' % zip_url)
 
     ModifyBootDesc(download_folder)
 
     # Put url in version file so we don't have to do this every time.
     fh = open(versioned_url_path, 'w+')
     fh.write(zip_url)
     fh.close()
 
 
-def RunAUTestHarness(board, channel, latest_url_base, zip_server_base):
+def RunAUTestHarness(board, channel, latest_url_base, zip_server_base,
+                     no_graphics, type, remote):
   """Runs the auto update test harness.
 
   The auto update test harness encapsulates testing the auto-update mechanism
   for the latest image against the latest official image from the channel.  This
   also tests images with suite_Smoke (built-in as part of its verification
   process).
 
   Args:
     board: the board for the latest image.
     channel: the channel to run the au test harness against.
     latest_url_base: base url for getting latest links.
     zip_server_base:  base url for zipped images.
+    no_graphics: boolean - If True, disable graphics during vm test.
+    type: which test harness to run.  Possible values: real, vm.
+    remote: ip address for real test harness run.
   """
   crosutils_root = os.path.join(os.path.dirname(__file__), '..')
   download_folder = os.path.abspath('latest_download')
   zip_url = GetLatestZipUrl(board, channel, latest_url_base, zip_server_base)
   GrabZipAndExtractImage(zip_url, download_folder, _IMAGE_TO_EXTRACT)
 
+  no_graphics_flag = ''
+  if no_graphics: no_graphics_flag = '--no_graphics'
+
   # Tests go here.
   latest_image = RunCommand(['./get_latest_image.sh', '--board=%s' % board],
                             cwd=crosutils_root, redirect_stdout=True,
-                            print_cmd=True)
+                            print_cmd=True).strip()
 
   RunCommand(['bin/cros_au_test_harness',
               '--base_image=%s' % os.path.join(download_folder,
                                                  _IMAGE_TO_EXTRACT),
-              '--target_image=%s' % latest_image,
-              '--board=%s' % board], cwd=crosutils_root)
+              '--target_image=%s' % os.path.join(latest_image,
+                                                 _IMAGE_TO_EXTRACT),
+              no_graphics_flag,
+              '--board=%s' % board,
+              '--type=%s' % type,
+              '--remote=%s' % remote,
+             ], cwd=crosutils_root)
 
 
 def main():
   parser = optparse.OptionParser()
   parser.add_option('-b', '--board',
                     help='board for the image to compare against.')
   parser.add_option('-c', '--channel',
                     help='channel for the image to compare against.')
   parser.add_option('-l', '--latestbase',
                     help='Base url for latest links.')
   parser.add_option('-z', '--zipbase',
                     help='Base url for hosted images.')
+  parser.add_option('--no_graphics', action='store_true', default=False,
+                    help='Disable graphics for the vm test.')
+  parser.add_option('--type', default='vm',
+                    help='type of test to run: [vm, real]. Default: vm.')
+  parser.add_option('--remote', default='0.0.0.0',
+                    help='For real tests, ip address of the target machine.')
+
   # Set the usage to include flags.
   parser.set_usage(parser.format_help())
   (options, args) = parser.parse_args()
 
   if args:
     parser.error('Extra args found %s.' % args)
 
   if not options.board:
     parser.error('Need board for image to compare against.')
 
   if not options.channel:
     parser.error('Need channel for image to compare against.')
 
   if not options.latestbase:
     parser.error('Need latest url base to get images.')
 
   if not options.zipbase:
     parser.error('Need zip url base to get images.')
 
   RunAUTestHarness(options.board, options.channel, options.latestbase,
-                   options.zipbase)
+                   options.zipbase, options.no_graphics, options.type,
+                   options.remote)
 
 
 if __name__ == '__main__':
   main()