[NaCl SDK] move VSNaClSDKRoot into ConfigurationGeneral section

visual_studio/NativeClientVSAddIn/UnitTests/TestUtilities.cs

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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 System.Collections.Generic;
   using System.IO;
   using System.Linq;
   using System.Management;
@@ skipping 308 matching lines @@
     /// <param name="configuration">Gives the platform and configuration type</param>
     /// <param name="pageName">Property page name where property resides.</param>
     /// <param name="propertyName">Name of the property to check.</param>
     /// <param name="expectedValue">Expected string to contain.</param>
     /// <param name="ignoreCase">Ignore case when comparing the expected and actual values.</param>
     public static void AssertPropertyContains(
         VCConfiguration configuration,
         string pageName,
         string propertyName,
         string expectedValue,
-        bool ignoreCase)
+        bool ignoreCase,
+        bool expand=false)

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

add param to docs above

     {
       StringComparison caseSensitive = ignoreCase ?
           StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal;
 
       IVCRulePropertyStorage rule = configuration.Rules.Item(pageName);
-      string propertyValue = rule.GetUnevaluatedPropertyValue(propertyName);
+      string propertyValue;
+      if (expand)
+        propertyValue = rule.GetEvaluatedPropertyValue(propertyName);
+      else
+        propertyValue = rule.GetUnevaluatedPropertyValue(propertyName);
+
 
       string message = string.Format(
           "{0} should be contained in {1}. Page: {2}, Property: {3}, Configuration: {4}",
           expectedValue,
           propertyValue,
           pageName,
           propertyName,
           configuration.ConfigurationName);
 
       Assert.IsTrue(propertyValue.Contains(expectedValue, caseSensitive), message);
@@ skipping 107 matching lines @@
       }
 
       foreach (DirectoryInfo subdir in dir.GetDirectories())
       {
         string path = Path.Combine(dest, subdir.Name);
         CopyDirectory(subdir.FullName, path);
       }
     }
   }
 }