summaryrefslogtreecommitdiff
path: root/base/sys_info_unittest.cc
diff options
context:
space:
mode:
authorLuis Hector Chavez <lhchavez@google.com>2016-07-15 16:23:21 -0700
committerTreehugger Robot <treehugger-gerrit@google.com>2016-07-27 16:41:28 +0000
commit0c4f26a46430b8c503c65f5cae1d2b6876d53e30 (patch)
treefb97dc88b72d681efeb9cfa1b8693a6183180ad9 /base/sys_info_unittest.cc
parent0cfccb799ce68cc66d389e6885f8d73f95ee5c4f (diff)
downloadlibchrome-0c4f26a46430b8c503c65f5cae1d2b6876d53e30.tar.gz
libchrome: Uprev the library to r405848 from Chromium
Pulled the latest and greatest version of libchrome from Chromium. The merge was done against r405848 which corresponds to git commit 909e5d3ecab27bb09cc570c1c215d0221bd6fe53 of Jul 15, 2016 Notable changes are: - base::Bind() now explicitly disallows captures in lambdas (which was never allowed in the style guide). - base::ListValue::iterator now exposes std::unique_ptr<base::Value> instead of raw base::Value*. BUG: 29104761 TEST: All tests in libchrome_test pass on dragonboard-eng build Change-Id: I94b285a3be074efa30c4e71ae93c8f2a99fb0b87
Diffstat (limited to 'base/sys_info_unittest.cc')
-rw-r--r--base/sys_info_unittest.cc17
1 files changed, 9 insertions, 8 deletions
diff --git a/base/sys_info_unittest.cc b/base/sys_info_unittest.cc
index 3f284ba868..0231df6379 100644
--- a/base/sys_info_unittest.cc
+++ b/base/sys_info_unittest.cc
@@ -16,13 +16,6 @@
typedef PlatformTest SysInfoTest;
using base::FilePath;
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-TEST_F(SysInfoTest, MaxSharedMemorySize) {
- // We aren't actually testing that it's correct, just that it's sane.
- EXPECT_GT(base::SysInfo::MaxSharedMemorySize(), 0u);
-}
-#endif
-
TEST_F(SysInfoTest, NumProcs) {
// We aren't actually testing that it's correct, just that it's sane.
EXPECT_GE(base::SysInfo::NumberOfProcessors(), 1);
@@ -40,7 +33,15 @@ TEST_F(SysInfoTest, AmountOfFreeDiskSpace) {
// We aren't actually testing that it's correct, just that it's sane.
FilePath tmp_path;
ASSERT_TRUE(base::GetTempDir(&tmp_path));
- EXPECT_GT(base::SysInfo::AmountOfFreeDiskSpace(tmp_path), 0)
+ EXPECT_GE(base::SysInfo::AmountOfFreeDiskSpace(tmp_path), 0)
+ << tmp_path.value();
+}
+
+TEST_F(SysInfoTest, AmountOfTotalDiskSpace) {
+ // We aren't actually testing that it's correct, just that it's sane.
+ FilePath tmp_path;
+ ASSERT_TRUE(base::GetTempDir(&tmp_path));
+ EXPECT_GT(base::SysInfo::AmountOfTotalDiskSpace(tmp_path), 0)
<< tmp_path.value();
}