NaCl VS Add-in User Changed Properties Fix

visual_studio/NativeClientVSAddIn/UnitTests/ProjectSettingsTest.cs

 // 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.
 
 namespace UnitTests
 {
   using System;
 
   using EnvDTE;
   using EnvDTE80;
@@ skipping 219 matching lines @@
     /// <param name="naclSolution">Path to the solution file to verify.</param>
     private void VerifyDefaultPepperSettings(string naclSolution)
     {
       OpenSolutionAndGetProperties(naclSolution, NativeClientVSAddIn.Strings.PepperPlatformName);
 
       string page;
 
       // General
       page = "ConfigurationGeneral";
       AllConfigsAssertPropertyEquals(page, "OutDir", @"$(ProjectDir)win\", true);
-      AllConfigsAssertPropertyEquals(page, "IntDir", @"$(ProjectDir)win\$(Configuration)\", true);
+      AllConfigsAssertPropertyEquals(page, "IntDir", @"win\$(Configuration)\", true);
       AllConfigsAssertPropertyEquals(page, "TargetExt", ".dll", true);
       AllConfigsAssertPropertyEquals(page, "ConfigurationType", "DynamicLibrary", true);
       AllConfigsAssertPropertyEquals(page, "VSNaClSDKRoot", @"$(NACL_SDK_ROOT)\", false);
       AllConfigsAssertPropertyEquals(page, "NaClWebServerPort", "5103", false);
       AllConfigsAssertPropertyEquals(page, "CharacterSet", "Unicode", false);
       AllConfigsAssertPropertyIsNotNullOrEmpty(page, "NaClAddInVersion");
 
       // Debugging
       page = "WindowsLocalDebugger";
       string chromePath = System.Environment.GetEnvironmentVariable(
@@ skipping 67 matching lines @@
     private void VerifyDefaultNaClSettings(string naclSolution)
     {
       OpenSolutionAndGetProperties(naclSolution, NativeClientVSAddIn.Strings.NaClPlatformName);
       
       string page;
 
       // General
       page = "ConfigurationGeneral";
       AllConfigsAssertPropertyEquals(page, "OutDir", @"$(ProjectDir)$(ToolchainName)\", true);
       AllConfigsAssertPropertyEquals(
-          page, "IntDir", @"$(ProjectDir)$(ToolchainName)\$(Configuration)\", true);
+          page, "IntDir", @"$(ToolchainName)\$(Configuration)\", true);
       AllConfigsAssertPropertyEquals(page, "ToolchainName", "newlib", true);
-      AllConfigsAssertPropertyEquals(page, "PlatformToolset", "win_x86_$(ToolchainName)", true);
       AllConfigsAssertPropertyEquals(page, "TargetArchitecture", "x86_64", true);
       AllConfigsAssertPropertyEquals(page, "VSNaClSDKRoot", @"$(NACL_SDK_ROOT)\", false);
       AllConfigsAssertPropertyEquals(page, "NaClManifestPath", string.Empty, false);
       AllConfigsAssertPropertyEquals(
           page, "NaClIrtPath", @"$(VSNaClSDKRoot)\tools\irt_x86_64.nexe", false);
       AllConfigsAssertPropertyEquals(page, "NaClWebServerPort", "5103", false);
       AllConfigsAssertPropertyIsNotNullOrEmpty(page, "NaClAddInVersion");
 
       // Debugging
       page = "WindowsLocalDebugger";
@@ skipping 175 matching lines @@
           debug_,
           pageName,
           propertyName);
       TestUtilities.AssertPropertyIsNotNullOrEmpty(
           release_,
           pageName,
           propertyName);
     }
   }
 }