Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2057)

Unified Diff: au_test_harness/vm_au_worker.py

Issue 6736023: Install test scripts into chroot. (Closed) Base URL: http://git.chromium.org/git/crostestutils.git@master
Patch Set: Fix path for chroot Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: au_test_harness/vm_au_worker.py
diff --git a/au_test_harness/vm_au_worker.py b/au_test_harness/vm_au_worker.py
index 9788fddcb27e8cdf2132a4353060205c3d95bbd5..aba034c54ef5f3342eeff353f0f1ec0f7efbc2e7 100644
--- a/au_test_harness/vm_au_worker.py
+++ b/au_test_harness/vm_au_worker.py
@@ -103,8 +103,9 @@ class VMAUWorker(au_worker.AUWorker):
(_, _, log_directory_in_chroot) = log_directory.rpartition('chroot')
# image_to_live already verifies lsb-release matching. This is just
# for additional steps.
- commandWithArgs = ['%s/cros_run_vm_test' % self.crosutilsbin,
- '--image_path=%s' % self.vm_image_path,
+ commandWithArgs = ['cros_run_vm_test',
+ '--image_path=%s' % cros_lib.ReinterpretPathForChroot(
+ self.vm_image_path),
'--snapshot',
'--persist',
'--kvm_pid=%s' % self._kvm_pid_file,
@@ -114,7 +115,8 @@ class VMAUWorker(au_worker.AUWorker):
]
if self.graphics_flag: commandWithArgs.append(self.graphics_flag)
output = cros_lib.RunCommand(commandWithArgs, error_ok=True,
- enter_chroot=False, redirect_stdout=True)
+ enter_chroot=True, redirect_stdout=True,
+ cwd=self.crosutils)
return self.AssertEnoughTestsPassed(unittest, output,
percent_required_to_pass)

Powered by Google App Engine
This is Rietveld 408576698