Made copying files to and from chromeos boxes consistent with
non-chromeos box copy. Edited run_benchmarks to use the new
convention.
For files and directories, both source and dest refer to the
directories being copied, not parent directories.
Added more tests for copying files to/from the chromeos machine.
Added missing commands in the dejaGNU job.
PRESUBMIT=passed
R=bjanakiraman,raymes
DELTA=97 (67 added, 10 deleted, 20 changed)
OCL=46314-p2
RCL=46342-p2
RDATE=2011/01/10 13:24:22
P4 change: 42608435
diff --git a/v14/remote_test.py b/v14/remote_test.py
index 83aebdf..f0a1c22 100755
--- a/v14/remote_test.py
+++ b/v14/remote_test.py
@@ -43,14 +43,49 @@
chromeos_root=options.chromeos_root,
machine=options.remote)
- version_dir = utils.GetRoot(sys.argv[0])[0]
- ce.CopyFiles(version_dir,
- "/tmp",
+ version_dir_path, script_name = utils.GetRoot(sys.argv[0])
+ version_dir = utils.GetRoot(version_dir_path)[1]
+
+ # Tests to copy directories and files to the chromeos box.
+ ce.CopyFiles(version_dir_path,
+ "/tmp/" + version_dir,
dest_machine=options.remote,
dest_cros=True,
chromeos_root=options.chromeos_root)
+ ce.CopyFiles(version_dir_path,
+ "/tmp/" + version_dir + "1",
+ dest_machine=options.remote,
+ dest_cros=True,
+ chromeos_root=options.chromeos_root)
+ ce.CopyFiles(sys.argv[0],
+ "/tmp/" + script_name,
+ recursive=False,
+ dest_machine=options.remote,
+ dest_cros=True,
+ chromeos_root=options.chromeos_root)
+ ce.CopyFiles(sys.argv[0],
+ "/tmp/" + script_name + "1",
+ recursive=False,
+ dest_machine=options.remote,
+ dest_cros=True,
+ chromeos_root=options.chromeos_root)
+
+ # Test to copy directories and files from the chromeos box.
+ ce.CopyFiles("/tmp/" + script_name,
+ "/tmp/hello",
+ recursive=False,
+ src_machine=options.remote,
+ src_cros=True,
+ chromeos_root=options.chromeos_root)
+ ce.CopyFiles("/tmp/" + script_name,
+ "/tmp/" + script_name,
+ recursive=False,
+ src_machine=options.remote,
+ src_cros=True,
+ chromeos_root=options.chromeos_root)
board = ce.CrosLearnBoard(options.chromeos_root, "172.18.117.239")
print board
+ return 0
if __name__ == "__main__":