AU: tolerate files that are symlinks in src image, yet not in new image.

test_utils.cc

 // Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "update_engine/test_utils.h"
 
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <errno.h>
 #include <stdio.h>
@@ skipping 190 matching lines @@
   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",
                                    kMountPath, kMountPath)));
+  EXPECT_EQ(0, System(StringPrintf("echo T > %s/srchardlink0", kMountPath)));
+  EXPECT_EQ(0, System(StringPrintf("ln %s/srchardlink0 %s/srchardlink1",
+                                   kMountPath, kMountPath)));
   EXPECT_EQ(0, System(StringPrintf("umount -d %s", kMountPath)));
 
   if (out_paths) {
     out_paths->clear();
     out_paths->push_back("");
     out_paths->push_back("/hi");
     out_paths->push_back("/hello");
     out_paths->push_back("/some_dir");
     out_paths->push_back("/some_dir/empty_dir");
     out_paths->push_back("/some_dir/mnt");
     out_paths->push_back("/some_dir/test");
     out_paths->push_back("/some_dir/fifo");
     out_paths->push_back("/cdev");
     out_paths->push_back("/testlink");
     out_paths->push_back("/sym");
+    out_paths->push_back("/srchardlink0");
+    out_paths->push_back("/srchardlink1");
     out_paths->push_back("/lost+found");
   }
 }
 
 void VerifyAllPaths(const string& parent, set<string> expected_paths) {
   FilesystemIterator iter(parent, set<string>());
   ino_t test_ino = 0;
   ino_t testlink_ino = 0;
   while (!iter.IsEnd()) {
     string path = iter.GetFullPath();
@@ skipping 46 matching lines @@
   std::string loop_dev = GetUnusedLoopDevice();
   EXPECT_EQ(0, system(StringPrintf("losetup %s %s", loop_dev.c_str(),
                                    file_path.c_str()).c_str()));
   loop_releaser_.reset(new ScopedLoopbackDeviceReleaser(loop_dev));
 
   EXPECT_TRUE(utils::MountFilesystem(loop_dev, *mnt_path, flags));
   unmounter_.reset(new ScopedFilesystemUnmounter(*mnt_path));
 }
 
 }  // namespace chromeos_update_engine