diff options
| author | Alex Vakulenko <avakulenko@chromium.org> | 2014-03-25 12:36:28 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-03-27 18:45:11 +0000 |
| commit | 75039d7397f03dff77bdf4e26398049ff88edc4c (patch) | |
| tree | a1403721dd45f801d8d95bbbcc612a71bdbb4483 /filesystem_copier_action_unittest.cc | |
| parent | 032e772f76a6cd0b4caf1af7bd02dd81af2dc7dd (diff) | |
update_engine: update to libbase 242728
Made update_engine link with libchrome-242728 and fixed compile
issues due to changes in namespaces and include file layout.
Also removed some of suppressed compiler warnings and fixed the
issues masked by them (e.g. mismatched printf-like specifiers).
Added -Wextra compiler option to enable additional useful warnings
to ensure more strict checking... Had to disable "unused-parameter"
though since we have a lot of functions (mainly in fakes) that do
not use all of their parameters.
BUG=chromium:351593
TEST=Unit tests passed.
CQ-DEPEND=CL:191721
Change-Id: I1aa63a48d5f1f4ea75ba6b00aec7aa5f3bad15c4
Reviewed-on: https://chromium-review.googlesource.com/191510
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>
Tested-by: Alex Vakulenko <avakulenko@chromium.org>
Diffstat (limited to 'filesystem_copier_action_unittest.cc')
| -rw-r--r-- | filesystem_copier_action_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/filesystem_copier_action_unittest.cc b/filesystem_copier_action_unittest.cc index d6f97421..891fd518 100644 --- a/filesystem_copier_action_unittest.cc +++ b/filesystem_copier_action_unittest.cc @@ -9,8 +9,8 @@ #include <vector> #include <base/posix/eintr_wrapper.h> -#include <base/string_util.h> -#include <base/stringprintf.h> +#include <base/strings/string_util.h> +#include <base/strings/stringprintf.h> #include <glib.h> #include <gmock/gmock.h> #include <gtest/gtest.h> @@ -410,7 +410,7 @@ TEST_F(FilesystemCopierActionTest, RunAsRootDetermineFilesystemSizeTest) { ScopedPathUnlinker img_unlinker(img); CreateExtImageAtPath(img, NULL); // Extend the "partition" holding the file system from 10MiB to 20MiB. - EXPECT_EQ(0, System(StringPrintf( + EXPECT_EQ(0, System(base::StringPrintf( "dd if=/dev/zero of=%s seek=20971519 bs=1 count=1", img.c_str()))); EXPECT_EQ(20 * 1024 * 1024, utils::FileSize(img)); |