Fix-up coding style and add PREUPLOAD.cfg file.
Previous commits broke the style specified our .clang-format file -
fixed this by running it through clang-format(1). During this process
discovered that I've been invoking clang-format(1) without the
--style=file option meaning that our .clang-format file actually
hadn't been used at all. So there's a rather big amount of formatting
changes in this CL.
Also replaced the .clang-format symlink target to
../../build/tools/brillo-clang-format with our own file since the
brillo one may go away in the future or not exist at all.
Finally, added a PREULOAD.cfg file to do this on every commit. See
https://android.googlesource.com/platform/tools/repohooks/
for more information about how this works.
Bug: None
Test: Manually tested.
Test: All unit tests pass.
Change-Id: I6461478a62efd81689bc4316c22f758e7f98f59f
diff --git a/test/avb_unittest_util.h b/test/avb_unittest_util.h
index 05390e4..e93e68c 100644
--- a/test/avb_unittest_util.h
+++ b/test/avb_unittest_util.h
@@ -81,8 +81,10 @@
" --rollback_index %" PRIu64
" %s %s "
" --output %s",
- rollback_index, additional_options.c_str(),
- signing_options.c_str(), vbmeta_image_path_.value().c_str());
+ rollback_index,
+ additional_options.c_str(),
+ signing_options.c_str(),
+ vbmeta_image_path_.value().c_str());
int64_t file_size;
ASSERT_TRUE(base::GetFileSize(vbmeta_image_path_, &file_size));
vbmeta_image_.resize(file_size);
@@ -102,17 +104,20 @@
}
base::FilePath image_path = testdir_.Append(file_name);
EXPECT_EQ(image_size,
- static_cast<const size_t>(base::WriteFile(
- image_path, reinterpret_cast<const char*>(image.data()),
- image.size())));
+ static_cast<const size_t>(
+ base::WriteFile(image_path,
+ reinterpret_cast<const char*>(image.data()),
+ image.size())));
return image_path;
}
/* Returns the output of 'avbtool info_image' for a given image. */
std::string InfoImage(const base::FilePath& image_path) {
base::FilePath tmp_path = testdir_.Append("info_output.txt");
- EXPECT_COMMAND(0, "./avbtool info_image --image %s --output %s",
- image_path.value().c_str(), tmp_path.value().c_str());
+ EXPECT_COMMAND(0,
+ "./avbtool info_image --image %s --output %s",
+ image_path.value().c_str(),
+ tmp_path.value().c_str());
std::string info_data;
EXPECT_TRUE(base::ReadFileToString(tmp_path, &info_data));
return info_data;
@@ -124,7 +129,8 @@
EXPECT_COMMAND(0,
"./avbtool extract_public_key --key %s"
" --output %s",
- key_path.value().c_str(), tmp_path.value().c_str());
+ key_path.value().c_str(),
+ tmp_path.value().c_str());
std::string key_data;
EXPECT_TRUE(base::ReadFileToString(tmp_path, &key_data));
return key_data;