Merge pull request #41 from tresorit/disable_pdb_parsing

Added option to turn off PDB file parsing
csoltenborn · Mar 25, 2016 · 291be42 · 291be42
2 parents 9ca93dd + 5775fcf
commit 291be42
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 3 deletions.
diff --git a/GoogleTestAdapter/Core.Tests/AbstractGoogleTestExtensionTests.cs b/GoogleTestAdapter/Core.Tests/AbstractGoogleTestExtensionTests.cs
@@ -99,6 +99,7 @@ virtual public void SetUp()
             MockOptions.Setup(o => o.RunDisabledTests).Returns(Options.OptionRunDisabledTestsDefaultValue);
             MockOptions.Setup(o => o.ShuffleTests).Returns(Options.OptionShuffleTestsDefaultValue);
             MockOptions.Setup(o => o.ShuffleTestsSeed).Returns(Options.OptionShuffleTestsSeedDefaultValue);
+            MockOptions.Setup(o => o.ParseSymbolInformation).Returns(Options.OptionParseSymbolInformationDefaultValue);
             MockOptions.Setup(o => o.DebugMode).Returns(Options.OptionDebugModeDefaultValue);
             MockOptions.Setup(o => o.AdditionalTestExecutionParam).Returns(Options.OptionAdditionalTestExecutionParamsDefaultValue);
             MockOptions.Setup(o => o.BatchForTestSetup).Returns(Options.OptionBatchForTestSetupDefaultValue);

diff --git a/GoogleTestAdapter/Core/Helpers/XmlOptions.cs b/GoogleTestAdapter/Core/Helpers/XmlOptions.cs
@@ -31,6 +31,7 @@ public interface IXmlOptions
         string TraitsRegexesAfter { get; set; }
         string TraitsRegexesBefore { get; set; }
         string TestNameSeparator { get; set; }
+        bool? ParseSymbolInformation { get; set; }
         bool? DebugMode { get; set; }
     }
 
@@ -55,6 +56,7 @@ public static void GetUnsetValuesFrom(this IXmlOptions self, IXmlOptions other)
             self.TraitsRegexesAfter = self.TraitsRegexesAfter ?? other.TraitsRegexesAfter;
             self.TraitsRegexesBefore = self.TraitsRegexesBefore ?? other.TraitsRegexesBefore;
             self.TestNameSeparator = self.TestNameSeparator ?? other.TestNameSeparator;
+            self.ParseSymbolInformation = self.ParseSymbolInformation ?? other.ParseSymbolInformation;
             self.DebugMode = self.DebugMode ?? other.DebugMode;
         }
     }

diff --git a/GoogleTestAdapter/Core/Options.cs b/GoogleTestAdapter/Core/Options.cs
@@ -161,6 +161,14 @@ public virtual List<RegexTraitPair> TraitsRegexesAfter
         public virtual string TestNameSeparator => XmlOptions.TestNameSeparator ?? OptionTestNameSeparatorDefaultValue;
 
 
+        public const string OptionParseSymbolInformation = "Parse symbol information";
+        public const bool OptionParseSymbolInformationDefaultValue = true;
+        public const string OptionParseSymbolInformationDescription =
+            "Parse debug symbol information for test executables to obtain source location information and traits (defined via the macros in GTA_Traits.h).\n" +
+            "If this is set to false step 2 of traits discovery will be left out and only traits regexes will be effective.";
+
+        public virtual bool ParseSymbolInformation => XmlOptions.ParseSymbolInformation ?? OptionParseSymbolInformationDefaultValue;
+
         public const string OptionDebugMode = "Debug mode";
         public const bool OptionDebugModeDefaultValue = false;
         public const string OptionDebugModeDescription =

diff --git a/GoogleTestAdapter/Core/TestCases/TestCaseFactory.cs b/GoogleTestAdapter/Core/TestCases/TestCaseFactory.cs
@@ -24,9 +24,16 @@ public IList<TestCase> CreateTestCases()
             var launcher = new ProcessLauncher(TestEnvironment, TestEnvironment.Options.PathExtension);
             List<string> consoleOutput = launcher.GetOutputOfCommand("", Executable, GoogleTestConstants.ListTestsOption.Trim(), false, false);
             IList<TestCaseDescriptor> testCaseDescriptors = new ListTestsParser(TestEnvironment).ParseListTestsOutput(consoleOutput);
-            List<TestCaseLocation> testCaseLocations = GetTestCaseLocations(testCaseDescriptors, TestEnvironment.Options.PathExtension);
 
-            return testCaseDescriptors.Select(descriptor => CreateTestCase(descriptor, testCaseLocations)).ToList();
+            if (TestEnvironment.Options.ParseSymbolInformation)
+            {
+                List<TestCaseLocation> testCaseLocations = GetTestCaseLocations(testCaseDescriptors, TestEnvironment.Options.PathExtension);
+                return testCaseDescriptors.Select(descriptor => CreateTestCase(descriptor, testCaseLocations)).ToList();
+            }
+            else
+            {
+                return testCaseDescriptors.Select(descriptor => CreateTestCase(descriptor)).ToList();
+            }
         }
 
         private List<TestCaseLocation> GetTestCaseLocations(IList<TestCaseDescriptor> testCaseDescriptors, string pathExtension)
@@ -51,6 +58,14 @@ private List<TestCaseLocation> GetTestCaseLocations(IList<TestCaseDescriptor> te
             return testCaseLocations;
         }
 
+        private TestCase CreateTestCase(TestCaseDescriptor descriptor)
+        {
+            var testCase = new TestCase(
+                descriptor.FullyQualifiedName, Executable, descriptor.DisplayName, "", 0);
+            testCase.Traits.AddRange(GetFinalTraits(descriptor.DisplayName, new List<Trait>()));
+            return testCase;
+        }
+
         private TestCase CreateTestCase(TestCaseDescriptor descriptor, List<TestCaseLocation> testCaseLocations)
         {
             TestCaseLocation location = testCaseLocations.FirstOrDefault(

diff --git a/GoogleTestAdapter/Resources/AllTestSettings.gta.runsettings b/GoogleTestAdapter/Resources/AllTestSettings.gta.runsettings
@@ -20,5 +20,6 @@
 		<TraitsRegexesAfter />
 		<TraitsRegexesBefore />
 		<TestNameSeparator />
+		<ParseSymbolInformation>true</ParseSymbolInformation>
 	</GoogleTestAdapter>
 </RunSettings>
diff --git a/GoogleTestAdapter/TestAdapter/Settings/RunSettings.cs b/GoogleTestAdapter/TestAdapter/Settings/RunSettings.cs
@@ -54,6 +54,9 @@ public RunSettings()
         public bool? DebugMode { get; set; }
         public bool ShouldSerializeDebugMode() { return DebugMode != null; }
 
+        public bool? ParseSymbolInformation { get; set; }
+        public bool ShouldSerializeParseSymbolInformation() { return ParseSymbolInformation != null; }
+
         public string AdditionalTestExecutionParam { get; set; }
         public bool ShouldSerializeAdditionalTestExecutionParam() { return AdditionalTestExecutionParam != null; }
 

diff --git a/GoogleTestAdapter/VsPackage/GoogleTestExtensionOptionsPage.cs b/GoogleTestAdapter/VsPackage/GoogleTestExtensionOptionsPage.cs
@@ -120,6 +120,7 @@ private RunSettings GetRunSettingsFromOptionPages()
                 TraitsRegexesBefore = generalOptions.TraitsRegexesBefore,
                 TraitsRegexesAfter = generalOptions.TraitsRegexesAfter,
                 TestNameSeparator = generalOptions.TestNameSeparator,
+                ParseSymbolInformation = generalOptions.ParseSymbolInformation,
                 DebugMode = generalOptions.DebugMode,
                 AdditionalTestExecutionParam = generalOptions.AdditionalTestExecutionParams,
                 BatchForTestSetup = generalOptions.BatchForTestSetup,
@@ -139,4 +140,4 @@ private RunSettings GetRunSettingsFromOptionPages()
 
     }
 
-}
+}
diff --git a/GoogleTestAdapter/VsPackage/OptionsPages/GeneralOptionsDialogPage.cs b/GoogleTestAdapter/VsPackage/OptionsPages/GeneralOptionsDialogPage.cs
@@ -74,6 +74,15 @@ public string TestNameSeparator
             set { SetAndNotify(ref testNameSeparator, value); }
         }
         private string testNameSeparator = Options.OptionTestNameSeparatorDefaultValue;
+
+        [DisplayName(Options.OptionParseSymbolInformation)]
+        [Description(Options.OptionParseSymbolInformationDescription)]
+        public bool ParseSymbolInformation
+        {
+            get { return parseSymbolInformation; }
+            set { SetAndNotify(ref parseSymbolInformation, value); }
+        }
+        private bool parseSymbolInformation = Options.OptionParseSymbolInformationDefaultValue;
 
         [Category(Options.CategoryName)]
         [DisplayName(Options.OptionAdditionalTestExecutionParams)]