Commit 72f4eb7b authored by Marc Treib's avatar Marc Treib Committed by Commit Bot

Disable SystemMetrics2Test.GetSystemMemoryInfo on ChromeOS

TBR=kylechar@chromium.org,agawronska@chromium.org

Bug: 1048073
Change-Id: Ie3822f2e9be287f31222fc24b0010d97ae799b04
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2033516Reviewed-by: default avatarMarc Treib <treib@chromium.org>
Commit-Queue: Marc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#737729}
parent 2fe06cdf
...@@ -417,7 +417,13 @@ TEST_F(SystemMetricsTest, ParseZramStat) { ...@@ -417,7 +417,13 @@ TEST_F(SystemMetricsTest, ParseZramStat) {
#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
defined(OS_ANDROID) defined(OS_ANDROID)
TEST(SystemMetrics2Test, GetSystemMemoryInfo) { // Failing on ChromeOS, crbug.com/1048073
#if defined(OS_CHROMEOS)
#define MAYBE_GetSystemMemoryInfo DISABLED_GetSystemMemoryInfo
#else
#define MAYBE_GetSystemMemoryInfo GetSystemMemoryInfo
#endif
TEST(SystemMetrics2Test, MAYBE_GetSystemMemoryInfo) {
SystemMemoryInfoKB info; SystemMemoryInfoKB info;
EXPECT_TRUE(GetSystemMemoryInfo(&info)); EXPECT_TRUE(GetSystemMemoryInfo(&info));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment