From e2976c87f7ba627fa1e1246f0ccfb34b4b9f3a73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Bostr=C3=B6m?= Date: Mon, 4 Jan 2016 22:44:05 +0100 Subject: Remove DISABLED_ON_ macros. Macro incorrectly displays DISABLED_ON_ANDROID in test names for parameterized tests under --gtest_list_tests, causing tests to be disabled on all platforms since they contain the DISABLED_ prefix rather than their expanded variants. This expands the macro variants to inline if they're disabled or not, and removes building some tests under configurations where they should fail, instead of building them but disabling them by default. The change also removes gtest_disable.h as an unused include from many other files. BUG=webrtc:5387, webrtc:5400 R=kjellander@webrtc.org, phoglund@webrtc.org TBR=henrik.lundin@webrtc.org Review URL: https://codereview.webrtc.org/1547343002 . Cr-Commit-Position: refs/heads/master@{#11150} --- webrtc/base/autodetectproxy_unittest.cc | 1 - 1 file changed, 1 deletion(-) (limited to 'webrtc/base/autodetectproxy_unittest.cc') diff --git a/webrtc/base/autodetectproxy_unittest.cc b/webrtc/base/autodetectproxy_unittest.cc index bc57304c0a..2ae7a6aa25 100644 --- a/webrtc/base/autodetectproxy_unittest.cc +++ b/webrtc/base/autodetectproxy_unittest.cc @@ -12,7 +12,6 @@ #include "webrtc/base/gunit.h" #include "webrtc/base/httpcommon.h" #include "webrtc/base/httpcommon-inl.h" -#include "webrtc/test/testsupport/gtest_disable.h" namespace rtc { -- cgit v1.2.3