From 6620630c343e077f117577604d0ea4ca0f8e25ff Mon Sep 17 00:00:00 2001 From: Don Garrett Date: Wed, 9 Feb 2011 13:51:43 -0800 Subject: [PATCH] Switch ctest to array/appends for cros_au_test_harness call. I was getting the error about passing along an empty string argument, and this will fix that. Change-Id: Iffd05fe570f3a6092bbeee05abf8a1884decd644 BUG=N0ne TEST=remote testing in progress (no VM testing) Review URL: http://codereview.chromium.org/6465014 --- bin/ctest.py | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/bin/ctest.py b/bin/ctest.py index f675dfd2c1..9388eaa225 100755 --- a/bin/ctest.py +++ b/bin/ctest.py @@ -257,24 +257,23 @@ def RunAUTestHarness(board, channel, latest_url_base, zip_server_base, 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).strip() - RunCommand(['bin/cros_au_test_harness', - '--base_image=%s' % os.path.join(download_folder, - _IMAGE_TO_EXTRACT), - '--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) + cmd = ['bin/cros_au_test_harness', + '--base_image=%s' % os.path.join(download_folder, + _IMAGE_TO_EXTRACT), + '--target_image=%s' % os.path.join(latest_image, + _IMAGE_TO_EXTRACT), + '--board=%s' % board, + '--type=%s' % type, + '--remote=%s' % remote, + ] + if no_graphics: cmd.append('--no_graphics') + + RunCommand(cmd, cwd=crosutils_root) def main():