Index: visual_studio/NativeClientVSAddIn/UnitTests/ProjectSettingsTest.cs |
diff --git a/visual_studio/NativeClientVSAddIn/UnitTests/ProjectSettingsTest.cs b/visual_studio/NativeClientVSAddIn/UnitTests/ProjectSettingsTest.cs |
index 44a482085e3b6434086f620e45df409d3a0e9c08..23af800fc87072d8e3cd522f8d05fa9e1687cfa5 100644 |
--- a/visual_studio/NativeClientVSAddIn/UnitTests/ProjectSettingsTest.cs |
+++ b/visual_studio/NativeClientVSAddIn/UnitTests/ProjectSettingsTest.cs |
@@ -190,6 +190,39 @@ namespace UnitTests |
} |
/// <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. |