AU: Changes for deltas on traditional bios machines.

delta_performer_unittest.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 <sys/mount.h>
 #include <inttypes.h>
 
 #include <algorithm>
 #include <string>
 #include <vector>
@@ skipping 56 matching lines @@
     unmounter_.reset(new ScopedFilesystemUnmounter(*mnt_path));
   }
  private:
   scoped_ptr<ScopedDirRemover> dir_remover_;
   scoped_ptr<ScopedLoopbackDeviceReleaser> loop_releaser_;
   scoped_ptr<ScopedFilesystemUnmounter> unmounter_;
 };
 
 void CompareFilesByBlock(const string& a_file, const string& b_file) {
   vector<char> a_data, b_data;
-  EXPECT_TRUE(utils::ReadFile(a_file, &a_data));
-  EXPECT_TRUE(utils::ReadFile(b_file, &b_data));
+  EXPECT_TRUE(utils::ReadFile(a_file, &a_data)) << "file failed: " << a_file;
+  EXPECT_TRUE(utils::ReadFile(b_file, &b_data)) << "file failed: " << b_file;
 
   EXPECT_EQ(a_data.size(), b_data.size());
   size_t kBlockSize = 4096;
   EXPECT_EQ(0, a_data.size() % kBlockSize);
   for (size_t i = 0; i < a_data.size(); i += kBlockSize) {
     EXPECT_EQ(0, i % kBlockSize);
     vector<char> a_sub(&a_data[i], &a_data[i + kBlockSize]);
     vector<char> b_sub(&b_data[i], &b_data[i + kBlockSize]);
     EXPECT_TRUE(a_sub == b_sub) << "Block " << (i/kBlockSize) << " differs";
   }
@@ skipping 127 matching lines @@
 
   CompareFilesByBlock(old_kernel, new_kernel);
   
   vector<char> updated_kernel_partition;
   EXPECT_TRUE(utils::ReadFile(old_kernel, &updated_kernel_partition));
   EXPECT_EQ(0, strncmp(&updated_kernel_partition[0], new_data_string,
                        strlen(new_data_string)));
 }
 
 }  // namespace chromeos_update_engine