Index: visual_studio/NativeClientVSAddIn/UnitTests/ProjectSettingsTest.cs |
diff --git a/visual_studio/NativeClientVSAddIn/UnitTests/ProjectSettingsTest.cs b/visual_studio/NativeClientVSAddIn/UnitTests/ProjectSettingsTest.cs |
index f4fa6db109a2699a17793a25d30d23b3ef84709f..a01c090c0e4c8965706b44e8564f7be81b32b7c9 100644 |
--- a/visual_studio/NativeClientVSAddIn/UnitTests/ProjectSettingsTest.cs |
+++ b/visual_studio/NativeClientVSAddIn/UnitTests/ProjectSettingsTest.cs |
@@ -1,4 +1,4 @@ |
-// Copyright (c) 2012 The Chromium Authors. All rights reserved. |
+// Copyright (c) 2012 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
@@ -11,7 +11,7 @@ namespace UnitTests |
using EnvDTE80; |
using Microsoft.VisualStudio.TestTools.UnitTesting; |
using Microsoft.VisualStudio.VCProjectEngine; |
- using NaCl.Build.CPPTasks; |
+ using NaCl.Build.CPPTasks; |
using NativeClientVSAddIn; |
/// <summary> |
@@ -108,6 +108,11 @@ namespace UnitTests |
[TestMethod] |
public void VerifySettingsWin32Initialization() |
{ |
+ if (TestUtilities.IsVS2012()) |
+ { |
+ // TODO(sbc): This test is unreliable under VS2012. http://crbug.com/246253 |
+ Assert.Inconclusive(); |
+ } |
string solutionWin32Initialization = TestUtilities.CreateBlankValidNaClSolution( |
dte_, "ProjectSettingsTestWin32Init", "Win32", "Win32", TestContext); |
VerifyDefaultPepperSettings(solutionWin32Initialization); |
@@ -142,6 +147,11 @@ namespace UnitTests |
[TestMethod] |
public void VerifySettingsPepperInitialization() |
{ |
+ if (TestUtilities.IsVS2012()) |
+ { |
+ // TODO(sbc): This test is unreliable under VS2012. http://crbug.com/246253 |
+ Assert.Inconclusive(); |
+ } |
string solutionPepperInitialization = TestUtilities.CreateBlankValidNaClSolution( |
dte_, |
"ProjectSettingsTestPepperInit", |
@@ -237,6 +247,11 @@ namespace UnitTests |
[TestMethod] |
public void VerifySettingsNaClInitialization() |
{ |
+ if (TestUtilities.IsVS2012()) |
+ { |
+ // TODO(sbc): This test is unreliable under VS2012. http://crbug.com/246253 |
+ Assert.Inconclusive(); |
+ } |
string solutionNaClInitialization = TestUtilities.CreateBlankValidNaClSolution( |
dte_, |
"ProjectSettingsTestNaClInit", |