zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

base: disabled several base tests on Mac so that rtc_unittests can be turned back on

Browse Source 
BUG=N/A
R=kjellander@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/30449004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7240 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrike@webrtc.org
2014-09-19 13:10:10 +00:00
parent bbe0a8517d
commit fded02c164
20 changed files with 126 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
webrtc/base/nat_unittest.cc
View File

@ -19,6 +19,7 @@
#include "webrtc/base/physicalsocketserver.h"
#include "webrtc/base/testclient.h"
#include "webrtc/base/virtualsocketserver.h"
#include "webrtc/test/testsupport/gtest_disable.h"
using namespace rtc;
@ -236,11 +237,11 @@ void TestPhysicalInternal(const SocketAddress& int_addr) {
TestFilters(int_pss.get(), int_addr, ext_pss.get(), ext_addrs);
}
TEST(NatTest, TestPhysicalIPv4) {
TEST(NatTest, DISABLED_ON_MAC(TestPhysicalIPv4)) {
TestPhysicalInternal(SocketAddress("127.0.0.1", 0));
}
TEST(NatTest, TestPhysicalIPv6) {
TEST(NatTest, DISABLED_ON_MAC(TestPhysicalIPv6)) {
if (HasIPv6Enabled()) {
TestPhysicalInternal(SocketAddress("::1", 0));
} else {
@ -278,11 +279,11 @@ void TestVirtualInternal(int family) {
TestFilters(int_vss.get(), int_addr, ext_vss.get(), ext_addrs);
}
TEST(NatTest, TestVirtualIPv4) {
TEST(NatTest, DISABLED_ON_MAC(TestVirtualIPv4)) {
TestVirtualInternal(AF_INET);
}
TEST(NatTest, TestVirtualIPv6) {
TEST(NatTest, DISABLED_ON_MAC(TestVirtualIPv6)) {
if (HasIPv6Enabled()) {
TestVirtualInternal(AF_INET6);
} else {