[NaCl SDK] move VSNaClSDKRoot into ConfigurationGeneral section

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 172 matching lines @@
       // NaCl inherit specific checks on the NaCl platform.
       OpenSolutionAndGetProperties(
           naclSolutionPepperInitialization, NativeClientVSAddIn.Strings.NaCl64PlatformName);
       AllConfigsAssertPropertyEquals("ConfigurationGeneral", "TargetExt", ".nexe", true);
       AllConfigsAssertPropertyEquals(
           "ConfigurationGeneral", "ConfigurationType", "Application", true);
       dte_.Solution.Close();
     }
 
     /// <summary>
+    /// Test that setting a custom NaClSDKRoot correctly effects the default values for
+    /// things like IncludePath.  This test is needed to protect against regressions where
+    /// the order of the properties could cause NaClSDKRoot to not effect the defaults.
+    /// </summary>
+    [TestMethod]
+    public void OverrideSDKRoot()
+    {
+        string slnName = TestUtilities.CreateBlankValidNaClSolution(
+            dte_,
+            "OverrideSDKRoot",
+            NativeClientVSAddIn.Strings.PepperPlatformName,
+            NativeClientVSAddIn.Strings.PepperPlatformName,
+            TestContext);
+
+        OpenSolutionAndGetProperties(slnName, NativeClientVSAddIn.Strings.PepperPlatformName);
+
+        // VC++ Directories
+        string page = "ConfigurationGeneral";
+        IVCRulePropertyStorage pageStorage = debug_.Rules.Item(page);
+        pageStorage.SetPropertyValue("VSNaClSDKRoot", @"foo\");
+
+        page = "ConfigurationDirectories";
+        TestUtilities.AssertPropertyContains(debug_, page, "IncludePath", @"foo\include;", true, true);

[binji, 2012/10/23 00:59:32]

nit: wrap all of these at 100 chars

+        TestUtilities.AssertPropertyContains(debug_, page, "IncludePath", @"foo\include\win;", true, true);
+        TestUtilities.AssertPropertyContains(debug_, page, "IncludePath", @"foo\include", true, true);
+        TestUtilities.AssertPropertyContains(debug_,
+            page, "LibraryPath", @"foo\lib\win_x86_32_host", true, true);
+        TestUtilities.AssertPropertyContains(debug_, page, "LibraryPath", @"foo\lib", true, true);
+
+        dte_.Solution.Close();
+    }
+
+    /// <summary>
     /// Test method which verifies that the Pepper platform has correct default properties
     /// when initialized from the NaCl platform. And that the NaCl platform has the correct
     /// settings when initialized from the 'empty' settings.
     /// </summary>
     [TestMethod]
     public void VerifySettingsNaClInitialization()
     {
       string naclSolutionNaClInitialization = TestUtilities.CreateBlankValidNaClSolution(
           dte_,
           "ProjectSettingsTestNaClInit",
@@ skipping 307 matching lines @@
           debug_,
           pageName,
           propertyName);
       TestUtilities.AssertPropertyIsNotNullOrEmpty(
           release_,
           pageName,
           propertyName);
     }
   }
 }