commit 07c4f2e8e3643e55257e0d68dbb3dee5b091c74e
author Chris Sosa <sosa@chromium.org> Fri Aug 02 16:24:18 2013 -0700
committer ChromeBot <chrome-bot@google.com> Mon Aug 05 14:29:50 2013 -0700
tree 9a51e28cc35e92d780c99b3307ed5385e86ac8c3
parent 09d74af74667c2bc9eb7858f01a06313ba3c528a

Fix a couple issues found when running ctest locally.

A couple issues cropped up when helping aviv debug ctest changes.
1) The --disk_layout change was never propagated to lib/test_helper
2) --only_verify without --quick should do the right thing.

This CL fixes both issues.

BUG=None
TEST=Ran it a few times with/without qemu image.

Change-Id: I072b8ef00aa08ac86e7a8d2677cd40fca3a0078c
Reviewed-on: https://gerrit.chromium.org/gerrit/64403
Tested-by: Chris Sosa <sosa@chromium.org>
Reviewed-by: Aviv Keshet <akeshet@chromium.org>
Commit-Queue: Chris Sosa <sosa@chromium.org>

ctest/ctest.py

diff --git a/ctest/ctest.py b/ctest/ctest.py
index 403914b..0be81a8 100755
--- a/ctest/ctest.py
+++ b/ctest/ctest.py
@@ -178,11 +178,11 @@
     if suite:
       cmd.append('--verify_suite_name=%s' % suite)
 
-    if not full:
-      if only_verify:
-        cmd.append('--test_prefix=SimpleTestVerify')
-      else:
-        cmd.append('--test_prefix=SimpleTest')
+    # Only verify takes precedence over --quick.
+    if only_verify:
+      cmd.append('--test_prefix=SimpleTestVerify')
+    elif not full:
+      cmd.append('--test_prefix=SimpleTest')
 
     if self.test_results_root: cmd.append('--test_results_root=%s' %
                                           self.test_results_root)

lib/test_helper.py

diff --git a/lib/test_helper.py b/lib/test_helper.py
index 157a49a..508b903 100644
--- a/lib/test_helper.py
+++ b/lib/test_helper.py
@@ -58,7 +58,7 @@
            '--from=%s' % git.ReinterpretPathForChroot(os.path.dirname(image)),
            '--test_image']
     if full:
-      cmd.extend(['--full'])
+      cmd.extend(['--disk_layout', '2gb-rootfs-updatable'])
     if board:
       cmd.extend(['--board', board])