visual_studio/NativeClientVSAddIn/UnitTests/ProjectSettingsTest.cs - Issue 10826232: NaCl VS Add-in User Changed Properties Fix

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: visual_studio/NativeClientVSAddIn/UnitTests/ProjectSettingsTest.cs

Issue 10826232: NaCl VS Add-in User Changed Properties Fix (Closed) Base URL: https://nativeclient-sdk.googlecode.com/svn/trunk/src

Patch Set: Created 8 years, 4 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:

Index: visual_studio/NativeClientVSAddIn/UnitTests/ProjectSettingsTest.cs

diff --git a/visual_studio/NativeClientVSAddIn/UnitTests/ProjectSettingsTest.cs b/visual_studio/NativeClientVSAddIn/UnitTests/ProjectSettingsTest.cs

index 979eeb29d521c6d498bfd0662bc681135f91b028..71bb7d3197213edc71cc26c5f49b1374cd53fe45 100644

--- a/visual_studio/NativeClientVSAddIn/UnitTests/ProjectSettingsTest.cs

+++ b/visual_studio/NativeClientVSAddIn/UnitTests/ProjectSettingsTest.cs

@@ -237,7 +237,7 @@ namespace UnitTests

// 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);

@@ -325,9 +325,8 @@ namespace UnitTests

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);