From 824897d49a5588f2cb79e7cbd45b36cb60404574 Mon Sep 17 00:00:00 2001 From: Christian Soltenborn Date: Mon, 16 Jan 2017 06:24:06 +0100 Subject: [PATCH] fixed some tests (#93) --- .../Tests.Common/Resources/Trx2TestRun.xslt | 37 ---- .../ResultChecker/TrxResultChecker.cs | 12 +- .../Tests.Common/TestMetadata.cs | 2 +- .../Tests.Common/TestResources.cs | 8 +- ...nsoleDllTests__HardCrashingSampleTests.xml | 4 - ...ampleTests_Settings_Coverage_Isolation.xml | 8 +- ...ampleTests_Coverage_NotExisting_EQ_Foo.xml | 164 ++++++++++++----- ..._Settings_Isolation_NotExisting_EQ_Foo.xml | 168 +++++++++++++----- ...h_AddPassesWithTraits_OR_Type_EQ_Small.xml | 28 +-- ...Tests_Coverage_Isolation_Type_EQ_Small.xml | 24 ++- ...ayName_EQ_TestMath_AddPassesWithTraits.xml | 8 +- ...ayName_EQ_TestMath_AddPassesWithTraits.xml | 8 +- ...ampleTests_Settings_Coverage_Isolation.xml | 168 +++++++++++++----- ...h_AddPassesWithTraits_OR_Type_EQ_Small.xml | 4 - ...ts__SampleTests_Settings_Type_EQ_Small.xml | 4 - .../ConsoleDllTests__X861_Coverage.xml | 8 +- ...nsoleDllTests__X861_Settings_Isolation.xml | 8 +- ...nsoleDllTests__X862_Coverage_Isolation.xml | 12 +- .../ConsoleDllTests__X862_Settings.xml | 4 - .../CrashingTests/CrashingTests.vcxproj | 8 +- SampleTests/LoadTests/LoadTests.vcxproj | 8 +- .../LongRunningTests/LongRunningTests.vcxproj | 4 +- SampleTests/Tests/Tests.vcxproj | 8 +- 23 files changed, 446 insertions(+), 261 deletions(-) diff --git a/GoogleTestAdapter/Tests.Common/Resources/Trx2TestRun.xslt b/GoogleTestAdapter/Tests.Common/Resources/Trx2TestRun.xslt index 58c4d27b0..0c9d2e52b 100644 --- a/GoogleTestAdapter/Tests.Common/Resources/Trx2TestRun.xslt +++ b/GoogleTestAdapter/Tests.Common/Resources/Trx2TestRun.xslt @@ -118,43 +118,6 @@ - - - - - - - - - - - - - - - - diff --git a/GoogleTestAdapter/Tests.Common/ResultChecker/TrxResultChecker.cs b/GoogleTestAdapter/Tests.Common/ResultChecker/TrxResultChecker.cs index 5de77c5de..6bd497308 100644 --- a/GoogleTestAdapter/Tests.Common/ResultChecker/TrxResultChecker.cs +++ b/GoogleTestAdapter/Tests.Common/ResultChecker/TrxResultChecker.cs @@ -61,9 +61,7 @@ public void RunTestsAndCheckOutput(string typeName, string arguments, string tes Assert.Inconclusive($"First time this test runs, created golden file - check for correctness! File: {goldenFile}"); } CheckIfFileIsParsable(goldenFile); - - string diffFile; - if (!CompareXmlFiles(goldenFile, transformedResultFile, out diffFile)) + if (!CompareXmlFiles(goldenFile, transformedResultFile, out string diffFile)) { if (!Directory.Exists(_diffFilesDir)) Directory.CreateDirectory(_diffFilesDir); @@ -90,15 +88,13 @@ public void RunTestsAndCheckOutput(string typeName, string arguments, string tes private string RunExecutableAndGetResultsFile(string arguments) { - string command = TestResources.GetVsTestConsolePath(TestMetadata.Versions.VS2015); + string command = TestResources.GetVsTestConsolePath(TestMetadata.Versions.VS2017); command.AsFileInfo().Should().Exist(); string workingDir = ""; var launcher = new TestProcessLauncher(); - List standardOut; - List standardErr; - launcher.GetOutputStreams(workingDir, command, arguments, out standardOut, out standardErr); + launcher.GetOutputStreams(workingDir, command, arguments, out var standardOut, out var standardErr); return ParseResultsFileFromOutput(standardOut); } @@ -164,7 +160,7 @@ private void CheckIfFileIsParsable(string file) private string ParseResultsFileFromOutput(List standardOut) { - string resultsFileRegex = @"Results File: (.*)"; + string resultsFileRegex = @"(?:Results File|Ergebnisdatei): (.*)"; string resultsFile = null; foreach (string line in standardOut) { diff --git a/GoogleTestAdapter/Tests.Common/TestMetadata.cs b/GoogleTestAdapter/Tests.Common/TestMetadata.cs index 693399419..817e387b3 100644 --- a/GoogleTestAdapter/Tests.Common/TestMetadata.cs +++ b/GoogleTestAdapter/Tests.Common/TestMetadata.cs @@ -13,6 +13,6 @@ public static class TestCategories public const string Load = "Load"; } - public enum Versions { VS2012 = 11, VS2013 = 12, VS2015 = 14 } + public enum Versions { VS2012 = 11, VS2013 = 12, VS2015 = 14, VS2017 = 15 } } } \ No newline at end of file diff --git a/GoogleTestAdapter/Tests.Common/TestResources.cs b/GoogleTestAdapter/Tests.Common/TestResources.cs index 8fe2ba9bf..fbd12fc9a 100644 --- a/GoogleTestAdapter/Tests.Common/TestResources.cs +++ b/GoogleTestAdapter/Tests.Common/TestResources.cs @@ -65,7 +65,13 @@ public static string GetGoldenFileName(string typeName, string testCaseName, str public static string GetVsTestConsolePath(TestMetadata.Versions version) { - return @"C:\Program Files (x86)\" + $"Microsoft Visual Studio {version:d}.0" + @"\Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe"; + switch (version) + { + case TestMetadata.Versions.VS2017: + return @"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe"; + default: + return @"C:\Program Files (x86)\" + $"Microsoft Visual Studio {version:d}.0" + @"\Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe"; + } } public static string NormalizePointerInfo(string text) diff --git a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__HardCrashingSampleTests.xml b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__HardCrashingSampleTests.xml index 8ee9d8ca5..16c83b8d8 100644 --- a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__HardCrashingSampleTests.xml +++ b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__HardCrashingSampleTests.xml @@ -64,10 +64,6 @@ Expected: 1000 - - - - diff --git a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__HardCrashingSampleTests_Settings_Coverage_Isolation.xml b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__HardCrashingSampleTests_Settings_Coverage_Isolation.xml index 3c6d404a4..c3790a99c 100644 --- a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__HardCrashingSampleTests_Settings_Coverage_Isolation.xml +++ b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__HardCrashingSampleTests_Settings_Coverage_Isolation.xml @@ -37,7 +37,9 @@ Expected: 1000 - + + + @@ -66,10 +68,6 @@ Expected: 1000 - - - - diff --git a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__NEG_SampleTests_Coverage_NotExisting_EQ_Foo.xml b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__NEG_SampleTests_Coverage_NotExisting_EQ_Foo.xml index d73c415eb..92922273e 100644 --- a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__NEG_SampleTests_Coverage_NotExisting_EQ_Foo.xml +++ b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__NEG_SampleTests_Coverage_NotExisting_EQ_Foo.xml @@ -1,7 +1,9 @@  - + + + @@ -21,7 +23,9 @@ Test failed: Something is wrong - + + + @@ -38,10 +42,18 @@ Test failed: Something is wrong - - - - + + + + + + + + + + + + @@ -50,7 +62,9 @@ Test failed: Something is wrong - + + + @@ -71,7 +85,9 @@ Expected: 1 - + + + @@ -92,7 +108,9 @@ Expected: 1 - + + + @@ -113,7 +131,9 @@ Expected: 1 - + + + @@ -319,8 +339,12 @@ at #2 - parameterizedtests.cpp:40 in $(Directory)\sampletests\tests\parameterize - - + + + + + + @@ -342,8 +366,12 @@ Expected: 130 - - + + + + + + @@ -354,8 +382,12 @@ Expected: 1000 - - + + + + + + @@ -374,10 +406,18 @@ Expected: 1000 - - - - + + + + + + + + + + + + @@ -395,16 +435,36 @@ Expected: 1 - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -413,7 +473,9 @@ Expected: 1 - + + + @@ -438,7 +500,9 @@ Expected: 1 - + + + @@ -455,10 +519,18 @@ Expected: 1 - - - - + + + + + + + + + + + + @@ -468,8 +540,12 @@ Expected: 1 - - + + + + + + @@ -480,7 +556,9 @@ Expected: 2 - + + + @@ -500,7 +578,9 @@ Which is: "\xE4\xF6\xFC\xDF\xC4\xD6\xDC" - + + + @@ -795,10 +875,6 @@ working_directory is $(Directory)\SampleTests\Debug - - - - diff --git a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__NEG_SampleTests_Settings_Isolation_NotExisting_EQ_Foo.xml b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__NEG_SampleTests_Settings_Isolation_NotExisting_EQ_Foo.xml index 9c69f44ff..33c3c334b 100644 --- a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__NEG_SampleTests_Settings_Isolation_NotExisting_EQ_Foo.xml +++ b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__NEG_SampleTests_Settings_Isolation_NotExisting_EQ_Foo.xml @@ -1,7 +1,9 @@  - + + + @@ -21,7 +23,9 @@ Test failed: Something is wrong - + + + @@ -38,10 +42,18 @@ Test failed: Something is wrong - - - - + + + + + + + + + + + + @@ -50,7 +62,9 @@ Test failed: Something is wrong - + + + @@ -71,7 +85,9 @@ Expected: 1 - + + + @@ -92,7 +108,9 @@ Expected: 1 - + + + @@ -113,7 +131,9 @@ Expected: 1 - + + + @@ -319,8 +339,12 @@ at #2 - parameterizedtests.cpp:40 in $(Directory)\sampletests\tests\parameterize - - + + + + + + @@ -342,8 +366,12 @@ Expected: 130 - - + + + + + + @@ -354,8 +382,12 @@ Expected: 1000 - - + + + + + + @@ -374,10 +406,18 @@ Expected: 1000 - - - - + + + + + + + + + + + + @@ -395,16 +435,36 @@ Expected: 1 - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -413,7 +473,9 @@ Expected: 1 - + + + @@ -438,7 +500,9 @@ Expected: 1 - + + + @@ -455,10 +519,18 @@ Expected: 1 - - - - + + + + + + + + + + + + @@ -468,8 +540,12 @@ Expected: 1 - - + + + + + + @@ -480,7 +556,9 @@ Expected: 2 - + + + @@ -500,7 +578,9 @@ Which is: "\xE4\xF6\xFC\xDF\xC4\xD6\xDC" - + + + @@ -517,7 +597,9 @@ Which is: "\xE4\xF6\xFC\xDF\xC4\xD6\xDC" - + + + @@ -785,10 +867,6 @@ Which is: "\xE4\xF6\xFC\xDF\xC4\xD6\xDC" - - - - diff --git a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Coverage_Isolation_DisplayName_EQ_TestMath_AddPassesWithTraits_OR_Type_EQ_Small.xml b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Coverage_Isolation_DisplayName_EQ_TestMath_AddPassesWithTraits_OR_Type_EQ_Small.xml index ba4da99cd..84ec32fdc 100644 --- a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Coverage_Isolation_DisplayName_EQ_TestMath_AddPassesWithTraits_OR_Type_EQ_Small.xml +++ b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Coverage_Isolation_DisplayName_EQ_TestMath_AddPassesWithTraits_OR_Type_EQ_Small.xml @@ -1,7 +1,9 @@  - + + + @@ -22,7 +24,9 @@ Expected: 1 - + + + @@ -71,10 +75,18 @@ at #2 - parameterizedtests.cpp:35 in $(Directory)\sampletests\tests\parameterize - - - - + + + + + + + + + + + + @@ -114,10 +126,6 @@ at #2 - parameterizedtests.cpp:35 in $(Directory)\sampletests\tests\parameterize - - - - diff --git a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Coverage_Isolation_Type_EQ_Small.xml b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Coverage_Isolation_Type_EQ_Small.xml index b344af747..762d4ef1a 100644 --- a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Coverage_Isolation_Type_EQ_Small.xml +++ b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Coverage_Isolation_Type_EQ_Small.xml @@ -1,7 +1,9 @@  - + + + @@ -22,7 +24,9 @@ Expected: 1 - + + + @@ -71,9 +75,15 @@ at #2 - parameterizedtests.cpp:35 in $(Directory)\sampletests\tests\parameterize - - - + + + + + + + + + @@ -110,10 +120,6 @@ at #2 - parameterizedtests.cpp:35 in $(Directory)\sampletests\tests\parameterize - - - - diff --git a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Isolation_DisplayName_EQ_TestMath_AddPassesWithTraits.xml b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Isolation_DisplayName_EQ_TestMath_AddPassesWithTraits.xml index c365fbb2e..a18b8db85 100644 --- a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Isolation_DisplayName_EQ_TestMath_AddPassesWithTraits.xml +++ b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Isolation_DisplayName_EQ_TestMath_AddPassesWithTraits.xml @@ -1,17 +1,15 @@  - + + + - - - - diff --git a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Settings_Coverage_DisplayName_EQ_TestMath_AddPassesWithTraits.xml b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Settings_Coverage_DisplayName_EQ_TestMath_AddPassesWithTraits.xml index c365fbb2e..a18b8db85 100644 --- a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Settings_Coverage_DisplayName_EQ_TestMath_AddPassesWithTraits.xml +++ b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Settings_Coverage_DisplayName_EQ_TestMath_AddPassesWithTraits.xml @@ -1,17 +1,15 @@  - + + + - - - - diff --git a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Settings_Coverage_Isolation.xml b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Settings_Coverage_Isolation.xml index 9c69f44ff..33c3c334b 100644 --- a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Settings_Coverage_Isolation.xml +++ b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Settings_Coverage_Isolation.xml @@ -1,7 +1,9 @@  - + + + @@ -21,7 +23,9 @@ Test failed: Something is wrong - + + + @@ -38,10 +42,18 @@ Test failed: Something is wrong - - - - + + + + + + + + + + + + @@ -50,7 +62,9 @@ Test failed: Something is wrong - + + + @@ -71,7 +85,9 @@ Expected: 1 - + + + @@ -92,7 +108,9 @@ Expected: 1 - + + + @@ -113,7 +131,9 @@ Expected: 1 - + + + @@ -319,8 +339,12 @@ at #2 - parameterizedtests.cpp:40 in $(Directory)\sampletests\tests\parameterize - - + + + + + + @@ -342,8 +366,12 @@ Expected: 130 - - + + + + + + @@ -354,8 +382,12 @@ Expected: 1000 - - + + + + + + @@ -374,10 +406,18 @@ Expected: 1000 - - - - + + + + + + + + + + + + @@ -395,16 +435,36 @@ Expected: 1 - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -413,7 +473,9 @@ Expected: 1 - + + + @@ -438,7 +500,9 @@ Expected: 1 - + + + @@ -455,10 +519,18 @@ Expected: 1 - - - - + + + + + + + + + + + + @@ -468,8 +540,12 @@ Expected: 1 - - + + + + + + @@ -480,7 +556,9 @@ Expected: 2 - + + + @@ -500,7 +578,9 @@ Which is: "\xE4\xF6\xFC\xDF\xC4\xD6\xDC" - + + + @@ -517,7 +597,9 @@ Which is: "\xE4\xF6\xFC\xDF\xC4\xD6\xDC" - + + + @@ -785,10 +867,6 @@ Which is: "\xE4\xF6\xFC\xDF\xC4\xD6\xDC" - - - - diff --git a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Settings_DisplayName_EQ_TestMath_AddPassesWithTraits_OR_Type_EQ_Small.xml b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Settings_DisplayName_EQ_TestMath_AddPassesWithTraits_OR_Type_EQ_Small.xml index bfc72cb15..8c6ed4c49 100644 --- a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Settings_DisplayName_EQ_TestMath_AddPassesWithTraits_OR_Type_EQ_Small.xml +++ b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Settings_DisplayName_EQ_TestMath_AddPassesWithTraits_OR_Type_EQ_Small.xml @@ -114,10 +114,6 @@ at #2 - parameterizedtests.cpp:35 in $(Directory)\sampletests\tests\parameterize - - - - diff --git a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Settings_Type_EQ_Small.xml b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Settings_Type_EQ_Small.xml index e401369ea..0252b7bc6 100644 --- a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Settings_Type_EQ_Small.xml +++ b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__SampleTests_Settings_Type_EQ_Small.xml @@ -110,10 +110,6 @@ at #2 - parameterizedtests.cpp:35 in $(Directory)\sampletests\tests\parameterize - - - - diff --git a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__X861_Coverage.xml b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__X861_Coverage.xml index 277443b51..9fdc94412 100644 --- a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__X861_Coverage.xml +++ b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__X861_Coverage.xml @@ -1,7 +1,9 @@  - + + + @@ -27,10 +29,6 @@ at #2 - main.cpp:41 in c:\prod\gtest-1.7.0\staticallylinkedgoogletests\main.cpp: - - - - diff --git a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__X861_Settings_Isolation.xml b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__X861_Settings_Isolation.xml index 277443b51..9fdc94412 100644 --- a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__X861_Settings_Isolation.xml +++ b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__X861_Settings_Isolation.xml @@ -1,7 +1,9 @@  - + + + @@ -27,10 +29,6 @@ at #2 - main.cpp:41 in c:\prod\gtest-1.7.0\staticallylinkedgoogletests\main.cpp: - - - - diff --git a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__X862_Coverage_Isolation.xml b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__X862_Coverage_Isolation.xml index 0cf4e235a..09014526f 100644 --- a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__X862_Coverage_Isolation.xml +++ b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__X862_Coverage_Isolation.xml @@ -1,8 +1,12 @@  - - + + + + + + @@ -12,10 +16,6 @@ - - - - diff --git a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__X862_Settings.xml b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__X862_Settings.xml index 0cf4e235a..a8e60a519 100644 --- a/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__X862_Settings.xml +++ b/GoogleTestAdapter/VsPackage.Tests.Generated/GoldenFiles/ConsoleDllTests__X862_Settings.xml @@ -12,10 +12,6 @@ - - - - diff --git a/SampleTests/CrashingTests/CrashingTests.vcxproj b/SampleTests/CrashingTests/CrashingTests.vcxproj index 666ff0e2b..f40f41083 100644 --- a/SampleTests/CrashingTests/CrashingTests.vcxproj +++ b/SampleTests/CrashingTests/CrashingTests.vcxproj @@ -105,7 +105,7 @@ Console - true + DebugFull false @@ -119,7 +119,7 @@ Console - true + DebugFull false @@ -135,7 +135,7 @@ Console - true + DebugFull true true false @@ -153,7 +153,7 @@ Console - true + DebugFull true true false diff --git a/SampleTests/LoadTests/LoadTests.vcxproj b/SampleTests/LoadTests/LoadTests.vcxproj index 386add3a3..4750c708f 100644 --- a/SampleTests/LoadTests/LoadTests.vcxproj +++ b/SampleTests/LoadTests/LoadTests.vcxproj @@ -97,7 +97,7 @@ Console - true + DebugFull @@ -111,7 +111,7 @@ Console - true + DebugFull @@ -129,7 +129,7 @@ Console true true - true + DebugFull @@ -147,7 +147,7 @@ Console true true - true + DebugFull diff --git a/SampleTests/LongRunningTests/LongRunningTests.vcxproj b/SampleTests/LongRunningTests/LongRunningTests.vcxproj index 8353a5a46..849f01f40 100644 --- a/SampleTests/LongRunningTests/LongRunningTests.vcxproj +++ b/SampleTests/LongRunningTests/LongRunningTests.vcxproj @@ -90,7 +90,7 @@ $(ProjectDir)..\3rdparty\gtest-1.7.0\fused-src;%(AdditionalIncludeDirectories) - true + DebugFull @@ -102,7 +102,7 @@ false - true + DebugFull diff --git a/SampleTests/Tests/Tests.vcxproj b/SampleTests/Tests/Tests.vcxproj index f331be2f4..9cea62db8 100644 --- a/SampleTests/Tests/Tests.vcxproj +++ b/SampleTests/Tests/Tests.vcxproj @@ -98,7 +98,7 @@ $(ProjectDir)..\3rdparty\gtest-1.7.0\fused-src;%(AdditionalIncludeDirectories) - true + DebugFull Console @@ -111,7 +111,7 @@ $(ProjectDir)..\3rdparty\gtest-1.7.0\fused-src;%(AdditionalIncludeDirectories) - true + DebugFull @@ -125,7 +125,7 @@ $(ProjectDir)..\3rdparty\gtest-1.7.0\fused-src;%(AdditionalIncludeDirectories) - true + DebugFull true true @@ -141,7 +141,7 @@ $(ProjectDir)..\3rdparty\gtest-1.7.0\fused-src;%(AdditionalIncludeDirectories) - true + DebugFull true true