commit 4fe15d017c145aca449c2248420c1b4ec8c23758
author Andrew de los Reyes <opensource@google.com> Thu Dec 10 19:01:36 2009 -0800
committer Andrew de los Reyes <opensource@google.com> Thu Dec 10 19:01:36 2009 -0800
tree 62d7c0cc4b73fdaae0ea34756650cfd3237d310f
parent 970bb28905b44bf9f2cb986bb412ecda1095b0b1

AU: Try delta updates first, then full updates

Also, some bug fixes.

Review URL: http://codereview.chromium.org/492008

test_utils.cc

diff --git a/test_utils.cc b/test_utils.cc
index d916458..f83ddf9 100644
--- a/test_utils.cc
+++ b/test_utils.cc
@@ -177,26 +177,25 @@
 
 void CreateExtImageAtPath(const string& path, vector<string>* out_paths) {
   // create 10MiB sparse file
-  const char* const mount_path = kMountPath.c_str();
   EXPECT_EQ(0, System(StringPrintf("dd if=/dev/zero of=%s"
                                    " seek=10485759 bs=1 count=1",
                                    path.c_str())));
   EXPECT_EQ(0, System(StringPrintf("mkfs.ext3 -F %s", path.c_str())));
-  EXPECT_EQ(0, System(StringPrintf("mkdir -p %s", mount_path)));
+  EXPECT_EQ(0, System(StringPrintf("mkdir -p %s", kMountPath)));
   EXPECT_EQ(0, System(StringPrintf("mount -o loop %s %s", path.c_str(),
-                                   mount_path)));
-  EXPECT_EQ(0, System(StringPrintf("echo hi > %s/hi", mount_path)));
-  EXPECT_EQ(0, System(StringPrintf("echo hello > %s/hello", mount_path)));
-  EXPECT_EQ(0, System(StringPrintf("mkdir %s/some_dir", mount_path)));
-  EXPECT_EQ(0, System(StringPrintf("mkdir %s/some_dir/empty_dir", mount_path)));
-  EXPECT_EQ(0, System(StringPrintf("mkdir %s/some_dir/mnt", mount_path)));
-  EXPECT_EQ(0, System(StringPrintf("echo T > %s/some_dir/test", mount_path)));
-  EXPECT_EQ(0, System(StringPrintf("mkfifo %s/some_dir/fifo", mount_path)));
-  EXPECT_EQ(0, System(StringPrintf("mknod %s/cdev c 2 3", mount_path)));
-  EXPECT_EQ(0, System(StringPrintf("ln -s /some/target %s/sym", mount_path)));
+                                   kMountPath)));
+  EXPECT_EQ(0, System(StringPrintf("echo hi > %s/hi", kMountPath)));
+  EXPECT_EQ(0, System(StringPrintf("echo hello > %s/hello", kMountPath)));
+  EXPECT_EQ(0, System(StringPrintf("mkdir %s/some_dir", kMountPath)));
+  EXPECT_EQ(0, System(StringPrintf("mkdir %s/some_dir/empty_dir", kMountPath)));
+  EXPECT_EQ(0, System(StringPrintf("mkdir %s/some_dir/mnt", kMountPath)));
+  EXPECT_EQ(0, System(StringPrintf("echo T > %s/some_dir/test", kMountPath)));
+  EXPECT_EQ(0, System(StringPrintf("mkfifo %s/some_dir/fifo", kMountPath)));
+  EXPECT_EQ(0, System(StringPrintf("mknod %s/cdev c 2 3", kMountPath)));
+  EXPECT_EQ(0, System(StringPrintf("ln -s /some/target %s/sym", kMountPath)));
   EXPECT_EQ(0, System(StringPrintf("ln %s/some_dir/test %s/testlink",
-                                   mount_path, mount_path)));
-  EXPECT_EQ(0, System(StringPrintf("umount %s", mount_path)));
+                                   kMountPath, kMountPath)));
+  EXPECT_EQ(0, System(StringPrintf("umount %s", kMountPath)));
   
   if (out_paths) {
     out_paths->clear();