| Index: mojo/public/cpp/bindings/tests/pickle_unittest.cc
|
| diff --git a/mojo/public/cpp/bindings/tests/pickle_unittest.cc b/mojo/public/cpp/bindings/tests/pickle_unittest.cc
|
| index a5947ce9edbd67b78f0504dda7cbe674e2d0f85d..25ee5d0214645cc04d6d4d2930381d6fabd627f6 100644
|
| --- a/mojo/public/cpp/bindings/tests/pickle_unittest.cc
|
| +++ b/mojo/public/cpp/bindings/tests/pickle_unittest.cc
|
| @@ -184,7 +184,22 @@ class PickleTest : public testing::Test {
|
|
|
| } // namespace
|
|
|
| -TEST_F(PickleTest, ChromiumProxyToChromiumService) {
|
| +#if _MSC_FULL_VER == 191025017
|
| +// Disabled due to this VS 2017 RTM code-gen bug:
|
| +// https://developercommunity.visualstudio.com/content/problem/40904/bad-code-gen-in-chromes-mojo-public-bindings-unitt.html
|
| +#define MAYBE_ChromiumProxyToChromiumService \
|
| + DISABLED_ChromiumProxyToChromiumService
|
| +#define MAYBE_ChromiumProxyToBlinkService DISABLED_ChromiumProxyToBlinkService
|
| +#define MAYBE_BlinkProxyToBlinkService DISABLED_BlinkProxyToBlinkService
|
| +#define MAYBE_BlinkProxyToChromiumService DISABLED_BlinkProxyToChromiumService
|
| +#else
|
| +#define MAYBE_ChromiumProxyToChromiumService ChromiumProxyToChromiumService
|
| +#define MAYBE_ChromiumProxyToBlinkService ChromiumProxyToBlinkService
|
| +#define MAYBE_BlinkProxyToBlinkService BlinkProxyToBlinkService
|
| +#define MAYBE_BlinkProxyToChromiumService BlinkProxyToChromiumService
|
| +#endif
|
| +
|
| +TEST_F(PickleTest, MAYBE_ChromiumProxyToChromiumService) {
|
| auto chromium_proxy = ConnectToChromiumService();
|
| {
|
| base::RunLoop loop;
|
| @@ -210,7 +225,7 @@ TEST_F(PickleTest, ChromiumProxyToChromiumService) {
|
| }
|
| }
|
|
|
| -TEST_F(PickleTest, ChromiumProxyToBlinkService) {
|
| +TEST_F(PickleTest, MAYBE_ChromiumProxyToBlinkService) {
|
| auto chromium_proxy = ConnectToBlinkService<PicklePasser>();
|
| {
|
| base::RunLoop loop;
|
| @@ -258,7 +273,7 @@ TEST_F(PickleTest, ChromiumProxyToBlinkService) {
|
| }
|
| }
|
|
|
| -TEST_F(PickleTest, BlinkProxyToBlinkService) {
|
| +TEST_F(PickleTest, MAYBE_BlinkProxyToBlinkService) {
|
| auto blink_proxy = ConnectToBlinkService();
|
| {
|
| base::RunLoop loop;
|
| @@ -277,7 +292,7 @@ TEST_F(PickleTest, BlinkProxyToBlinkService) {
|
| }
|
| }
|
|
|
| -TEST_F(PickleTest, BlinkProxyToChromiumService) {
|
| +TEST_F(PickleTest, MAYBE_BlinkProxyToChromiumService) {
|
| auto blink_proxy = ConnectToChromiumService<blink::PicklePasser>();
|
| {
|
| base::RunLoop loop;
|
|
|