Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 using System; | 4 using System; |
| 5 using System.Text; | 5 using System.Text; |
| 6 using System.Collections.Generic; | 6 using System.Collections.Generic; |
| 7 using EnvDTE80; | 7 using EnvDTE80; |
| 8 using Microsoft.VisualStudio.TestTools.UnitTesting; | 8 using Microsoft.VisualStudio.TestTools.UnitTesting; |
| 9 using Microsoft.VisualStudio.VCProjectEngine; | 9 using Microsoft.VisualStudio.VCProjectEngine; |
| 10 using NaCl.Build.CPPTasks; | 10 using NaCl.Build.CPPTasks; |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 54 } | 54 } |
| 55 CheckCompile(Strings.NaClARMPlatformName); | 55 CheckCompile(Strings.NaClARMPlatformName); |
| 56 } | 56 } |
| 57 | 57 |
| 58 /// <summary> | 58 /// <summary> |
| 59 /// Test method to check that the Pepper platform compiles a test projec t. | 59 /// Test method to check that the Pepper platform compiles a test projec t. |
| 60 /// </summary> | 60 /// </summary> |
| 61 [TestMethod] | 61 [TestMethod] |
| 62 public void CheckPepperCompile() | 62 public void CheckPepperCompile() |
| 63 { | 63 { |
| 64 if (!TestUtilities.IsVS2012()) | |
| 65 { | |
| 66 // The pre-compiled libraries in the SDK (specifically | |
| 67 // ppapi_cpp.lib) are not linkable except with 2012 so | |
| 68 // this test will always fail with link errors under 2010 | |
| 69 // or any other Visual Studio version. | |
| 70 return; | |
|
binji
2015/02/24 00:35:05
Isn't this what Assert.Inconclusive() is for?
| |
| 71 } | |
| 64 CheckCompile(Strings.PepperPlatformName); | 72 CheckCompile(Strings.PepperPlatformName); |
| 65 } | 73 } |
| 66 | 74 |
| 67 /// <summary> | 75 /// <summary> |
| 68 /// Test method to check that the NaCl platform compiles a test project. | 76 /// Test method to check that the NaCl platform compiles a test project. |
| 69 /// </summary> | 77 /// </summary> |
| 70 [TestMethod] | 78 [TestMethod] |
| 71 public void CheckPNaClCompile() | 79 public void CheckPNaClCompile() |
| 72 { | 80 { |
| 73 string root = System.Environment.GetEnvironmentVariable("NACL_SDK_RO OT"); | 81 string root = System.Environment.GetEnvironmentVariable("NACL_SDK_RO OT"); |
| 74 if (!SDKUtilities.SupportsPNaCl(root)) | 82 if (!SDKUtilities.SupportsPNaCl(root)) |
| 75 { | 83 { |
| 76 Assert.Inconclusive(); | 84 Assert.Inconclusive(); |
| 77 } | 85 } |
| 78 CheckCompile(Strings.PNaClPlatformName); | 86 CheckCompile(Strings.PNaClPlatformName); |
| 79 } | 87 } |
| 80 | 88 |
| 81 } | 89 } |
| 82 } | 90 } |
| OLD | NEW |