| 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 EnvDTE; | 7 using EnvDTE; |
| 8 using EnvDTE80; | 8 using EnvDTE80; |
| 9 using Microsoft.VisualStudio.TestTools.UnitTesting; | 9 using Microsoft.VisualStudio.TestTools.UnitTesting; |
| 10 using Microsoft.VisualStudio.VCProjectEngine; | 10 using Microsoft.VisualStudio.VCProjectEngine; |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 { | 146 { |
| 147 CheckCompile(NativeClientVSAddIn.Strings.PepperPlatformName, true); | 147 CheckCompile(NativeClientVSAddIn.Strings.PepperPlatformName, true); |
| 148 } | 148 } |
| 149 | 149 |
| 150 /// <summary> | 150 /// <summary> |
| 151 /// Test method to check that the NaCl platform compiles a test project. | 151 /// Test method to check that the NaCl platform compiles a test project. |
| 152 /// </summary> | 152 /// </summary> |
| 153 [TestMethod] | 153 [TestMethod] |
| 154 public void CheckPNaClCompile() | 154 public void CheckPNaClCompile() |
| 155 { | 155 { |
| 156 int revision; | |
| 157 string root = System.Environment.GetEnvironmentVariable("NACL_SDK_RO
OT"); | 156 string root = System.Environment.GetEnvironmentVariable("NACL_SDK_RO
OT"); |
| 158 SDKUtilities.GetSDKVersion(root, out revision); | 157 if (!SDKUtilities.SupportsPNaCl(root)) |
| 159 if (revision < SDKUtilities.MinPNaCLSDKVersion) | |
| 160 { | 158 { |
| 161 Assert.Inconclusive(); | 159 Assert.Inconclusive(); |
| 162 } | 160 } |
| 163 CheckCompile(NativeClientVSAddIn.Strings.PNaClPlatformName, false); | 161 CheckCompile(NativeClientVSAddIn.Strings.PNaClPlatformName, false); |
| 164 } | 162 } |
| 165 | 163 |
| 166 private void CheckCompile(string platform, bool dll) | 164 private void CheckCompile(string platform, bool dll) |
| 167 { | 165 { |
| 168 SetProjectType("Executable", platform); | 166 SetProjectType("Executable", platform); |
| 169 TryCompile("Debug", platform); | 167 TryCompile("Debug", platform); |
| 170 TryCompile("Release", platform); | 168 TryCompile("Release", platform); |
| 171 SetProjectType("StaticLibrary", platform); | 169 SetProjectType("StaticLibrary", platform); |
| 172 TryCompile("Debug", platform); | 170 TryCompile("Debug", platform); |
| 173 TryCompile("Release", platform); | 171 TryCompile("Release", platform); |
| 174 if (dll) | 172 if (dll) |
| 175 { | 173 { |
| 176 SetProjectType("DynamicLibrary", platform); | 174 SetProjectType("DynamicLibrary", platform); |
| 177 TryCompile("Debug", platform); | 175 TryCompile("Debug", platform); |
| 178 TryCompile("Release", platform); | 176 TryCompile("Release", platform); |
| 179 } | 177 } |
| 180 } | 178 } |
| 181 } | 179 } |
| 182 } | 180 } |
| OLD | NEW |