Truly disable tests.
...which weren't successfully disabled in https://chromium.googlesource.com/external/webrtc.git/+/55d6e7ca5f685af32737c460687be39f8eb7b9e2
TBR=kjellander@webrtc.org, torbjorng@webrtc.org
BUG=webrtc:5659
Review URL: https://codereview.webrtc.org/1808643005 .
Cr-Commit-Position: refs/heads/master@{#12049}
diff --git a/webrtc/api/peerconnectioninterface_unittest.cc b/webrtc/api/peerconnectioninterface_unittest.cc
index c89455a..6bff11a 100644
--- a/webrtc/api/peerconnectioninterface_unittest.cc
+++ b/webrtc/api/peerconnectioninterface_unittest.cc
@@ -1667,7 +1667,7 @@
}
// Disabled on Win dbg: https://bugs.chromium.org/p/webrtc/issues/detail?id=5659
-#if defined(WIN) && defined(_DEBUG)
+#if defined(WEBRTC_WIN) && defined(_DEBUG)
#define MAYBE_ReceiveFireFoxOffer DISABLED_ReceiveFireFoxOffer
#else
#define MAYBE_ReceiveFireFoxOffer ReceiveFireFoxOffer
@@ -2040,7 +2040,7 @@
}
// Disabled on Win dbg: https://bugs.chromium.org/p/webrtc/issues/detail?id=5659
-#if defined(WIN) && defined(_DEBUG)
+#if defined(WEBRTC_WIN) && defined(_DEBUG)
#define MAYBE_SdpWithoutMsidCreatesDefaultStream \
DISABLED_SdpWithoutMsidCreatesDefaultStream
#else
@@ -2051,7 +2051,7 @@
// description doesn't contain any streams and no MSID support.
// It also tests that the default stream is updated if a video m-line is added
// in a subsequent session description.
-TEST_F(PeerConnectionInterfaceTest, SdpWithoutMsidCreatesDefaultStream) {
+TEST_F(PeerConnectionInterfaceTest, MAYBE_SdpWithoutMsidCreatesDefaultStream) {
FakeConstraints constraints;
constraints.AddMandatory(webrtc::MediaConstraintsInterface::kEnableDtlsSrtp,
true);
@@ -2078,7 +2078,7 @@
}
// Disabled on Win dbg: https://bugs.chromium.org/p/webrtc/issues/detail?id=5659
-#if defined(WIN) && defined(_DEBUG)
+#if defined(WEBRTC_WIN) && defined(_DEBUG)
#define MAYBE_SendOnlySdpWithoutMsidCreatesDefaultStream \
DISABLED_SendOnlySdpWithoutMsidCreatesDefaultStream
#else
@@ -2121,7 +2121,7 @@
}
// Disabled on Win dbg: https://bugs.chromium.org/p/webrtc/issues/detail?id=5659
-#if defined(WIN) && defined(_DEBUG)
+#if defined(WEBRTC_WIN) && defined(_DEBUG)
#define MAYBE_SdpWithoutMsidAndStreamsCreatesDefaultStream \
DISABLED_SdpWithoutMsidAndStreamsCreatesDefaultStream
#else
@@ -2146,7 +2146,7 @@
}
// Disabled on Win dbg: https://bugs.chromium.org/p/webrtc/issues/detail?id=5659
-#if defined(WIN) && defined(_DEBUG)
+#if defined(WEBRTC_WIN) && defined(_DEBUG)
#define MAYBE_SdpWithMsidDontCreatesDefaultStream \
DISABLED_SdpWithMsidDontCreatesDefaultStream
#else
@@ -2165,7 +2165,7 @@
}
// Disabled on Win dbg: https://bugs.chromium.org/p/webrtc/issues/detail?id=5659
-#if defined(WIN) && defined(_DEBUG)
+#if defined(WEBRTC_WIN) && defined(_DEBUG)
#define MAYBE_DefaultTracksNotDestroyedAndRecreated \
DISABLED_DefaultTracksNotDestroyedAndRecreated
#else
@@ -2175,7 +2175,8 @@
// This tests that when setting a new description, the old default tracks are
// not destroyed and recreated.
// See: https://bugs.chromium.org/p/webrtc/issues/detail?id=5250
-TEST_F(PeerConnectionInterfaceTest, DefaultTracksNotDestroyedAndRecreated) {
+TEST_F(PeerConnectionInterfaceTest,
+ MAYBE_DefaultTracksNotDestroyedAndRecreated) {
FakeConstraints constraints;
constraints.AddMandatory(webrtc::MediaConstraintsInterface::kEnableDtlsSrtp,
true);
@@ -2211,7 +2212,7 @@
}
// Disabled on Win dbg: https://bugs.chromium.org/p/webrtc/issues/detail?id=5659
-#if defined(WIN) && defined(_DEBUG)
+#if defined(WEBRTC_WIN) && defined(_DEBUG)
#define MAYBE_LocalDescriptionChanged DISABLED_LocalDescriptionChanged
#else
#define MAYBE_LocalDescriptionChanged LocalDescriptionChanged
@@ -2257,7 +2258,7 @@
}
// Disabled on Win dbg: https://bugs.chromium.org/p/webrtc/issues/detail?id=5659
-#if defined(WIN) && defined(_DEBUG)
+#if defined(WEBRTC_WIN) && defined(_DEBUG)
#define MAYBE_AddLocalStreamAfterLocalDescriptionChanged \
DISABLED_AddLocalStreamAfterLocalDescriptionChanged
#else
@@ -2294,7 +2295,7 @@
}
// Disabled on Win dbg: https://bugs.chromium.org/p/webrtc/issues/detail?id=5659
-#if defined(WIN) && defined(_DEBUG)
+#if defined(WEBRTC_WIN) && defined(_DEBUG)
#define MAYBE_ChangeSsrcOnTrackInLocalSessionDescription \
DISABLED_ChangeSsrcOnTrackInLocalSessionDescription
#else
@@ -2349,7 +2350,7 @@
}
// Disabled on Win dbg: https://bugs.chromium.org/p/webrtc/issues/detail?id=5659
-#if defined(WIN) && defined(_DEBUG)
+#if defined(WEBRTC_WIN) && defined(_DEBUG)
#define MAYBE_SignalSameTracksInSeparateMediaStream \
DISABLED_SignalSameTracksInSeparateMediaStream
#else