Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(164)

Side by Side Diff: visual_studio/NativeClientVSAddIn/UnitTests/PropertyManagerTest.cs

Issue 11017068: Fix name of 32-bit nexes to make create_nmf happy (Closed) Base URL: http://nativeclient-sdk.googlecode.com/svn/trunk/src
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 4
5 namespace UnitTests 5 namespace UnitTests
6 { 6 {
7 using System; 7 using System;
8 using System.IO; 8 using System.IO;
9 9
10 using EnvDTE; 10 using EnvDTE;
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 target.SetTarget(naclProject, Strings.NaCl64PlatformName, "Debug"); 186 target.SetTarget(naclProject, Strings.NaCl64PlatformName, "Debug");
187 Assert.AreEqual( 187 Assert.AreEqual(
188 PropertyManager.ProjectPlatformType.NaCl, 188 PropertyManager.ProjectPlatformType.NaCl,
189 target.ProjectPlatform, 189 target.ProjectPlatform,
190 "SetTarget did not succeed with nacl platform on valid project."); 190 "SetTarget did not succeed with nacl platform on valid project.");
191 191
192 string slnDir = Path.GetDirectoryName(naclSolution); 192 string slnDir = Path.GetDirectoryName(naclSolution);
193 string projectDir = Path.Combine( 193 string projectDir = Path.Combine(
194 slnDir, Path.GetDirectoryName(TestUtilities.BlankNaClProjectUniqueName )) + @"\"; 194 slnDir, Path.GetDirectoryName(TestUtilities.BlankNaClProjectUniqueName )) + @"\";
195 string outputDir = Path.Combine(slnDir, "NaCl64", "newlib", "Debug") + @"\ "; 195 string outputDir = Path.Combine(slnDir, "NaCl64", "newlib", "Debug") + @"\ ";
196 string assembly = Path.Combine(outputDir, TestUtilities.BlankNaClProjectNa me + "_x86_64.nexe"); 196 string assembly = Path.Combine(outputDir, TestUtilities.BlankNaClProjectNa me + "_64.nexe");
197 197
198 Assert.AreEqual(expectedSDKRootDir, target.SDKRootDirectory, "SDK Root."); 198 Assert.AreEqual(expectedSDKRootDir, target.SDKRootDirectory, "SDK Root.");
199 Assert.AreEqual(projectDir, target.ProjectDirectory, "ProjectDirectory."); 199 Assert.AreEqual(projectDir, target.ProjectDirectory, "ProjectDirectory.");
200 Assert.AreEqual(outputDir, target.OutputDirectory, "OutputDirectory."); 200 Assert.AreEqual(outputDir, target.OutputDirectory, "OutputDirectory.");
201 Assert.AreEqual(assembly, target.PluginAssembly, "PluginAssembly."); 201 Assert.AreEqual(assembly, target.PluginAssembly, "PluginAssembly.");
202 Assert.AreEqual( 202 Assert.AreEqual(
203 @"newlib", 203 @"newlib",
204 target.GetProperty("ConfigurationGeneral", "ToolchainName"), 204 target.GetProperty("ConfigurationGeneral", "ToolchainName"),
205 "GetProperty() with ToolchainName incorrect."); 205 "GetProperty() with ToolchainName incorrect.");
206 } 206 }
(...skipping 23 matching lines...) Expand all
230 230
231 string newValue = "ThisIsNew"; 231 string newValue = "ThisIsNew";
232 target.SetProperty("ConfigurationGeneral", "VSNaClSDKRoot", newValue); 232 target.SetProperty("ConfigurationGeneral", "VSNaClSDKRoot", newValue);
233 Assert.AreEqual( 233 Assert.AreEqual(
234 newValue, 234 newValue,
235 target.GetProperty("ConfigurationGeneral", "VSNaClSDKRoot"), 235 target.GetProperty("ConfigurationGeneral", "VSNaClSDKRoot"),
236 "SetProperty() did not set property VSNaClSDKRoot."); 236 "SetProperty() did not set property VSNaClSDKRoot.");
237 } 237 }
238 } 238 }
239 } 239 }
OLDNEW
« no previous file with comments | « visual_studio/NativeClientVSAddIn/InstallerResources/examples/hello_world_gles/hello_world_gles/hello_world_gles.vcxproj ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698