Commit cb4bd699 authored by Ben Pastene's avatar Ben Pastene Committed by Commit Bot

Disable TestTCPSocketRTT on chromeos (take 2).

crrev.com/c/1179227 didn't actually disable it. Looks like we messed up
the conditional a little.

Bug: 875104
Change-Id: Ide2caab7969f2aa33f6c16e7b73e2f389273f9fe
Reviewed-on: https://chromium-review.googlesource.com/1189033Reviewed-by: default avatarAsanka Herath <asanka@chromium.org>
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/heads/master@{#586347}
parent ad7fea06
...@@ -1905,8 +1905,8 @@ TEST_F(NetworkQualityEstimatorTest, TestGlobalSocketWatcherThrottle) { ...@@ -1905,8 +1905,8 @@ TEST_F(NetworkQualityEstimatorTest, TestGlobalSocketWatcherThrottle) {
// TestTCPSocketRTT requires kernel support for tcp_info struct, and so it is // TestTCPSocketRTT requires kernel support for tcp_info struct, and so it is
// enabled only on certain platforms. // enabled only on certain platforms.
#if defined(TCP_INFO) || defined(OS_LINUX) || defined(OS_ANDROID) || \ #if defined(TCP_INFO) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || \
defined(OS_CHROMEOS) defined(OS_ANDROID)
#define MAYBE_TestTCPSocketRTT TestTCPSocketRTT #define MAYBE_TestTCPSocketRTT TestTCPSocketRTT
#else #else
#define MAYBE_TestTCPSocketRTT DISABLED_TestTCPSocketRTT #define MAYBE_TestTCPSocketRTT DISABLED_TestTCPSocketRTT
......
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