Build file changes to run perf tests

ite-klass · Jun 11, 2016 · ba8ac46 · ba8ac46
1 parent a2c2f38
commit ba8ac46
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/Build.ps1 b/Build.ps1
@@ -17,5 +17,11 @@ Push-Location test/Serilog.Tests
 & dotnet test -c Release
 if($LASTEXITCODE -ne 0) { exit 2 }
 
+Pop-Location
+Push-Location test/Serilog.PerformanceTests
+
+& dotnet test -c Release
+if($LASTEXITCODE -ne 0) { exit 2 }
+
 Pop-Location
 Pop-Location
diff --git a/Serilog.sln b/Serilog.sln
@@ -24,6 +24,8 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Tests", "test\Seril
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TestDummies", "test\TestDummies\TestDummies.xproj", "{2BB12CE5-C867-43BD-AE5D-253FE3248C7F}"
 EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.PerformanceTests", "test\Serilog.PerformanceTests\Serilog.PerformanceTests.xproj", "{D7A37F73-BBA3-4DAE-9648-1A753A86F968}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -42,6 +44,10 @@ Global
 		{2BB12CE5-C867-43BD-AE5D-253FE3248C7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2BB12CE5-C867-43BD-AE5D-253FE3248C7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2BB12CE5-C867-43BD-AE5D-253FE3248C7F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D7A37F73-BBA3-4DAE-9648-1A753A86F968}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D7A37F73-BBA3-4DAE-9648-1A753A86F968}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D7A37F73-BBA3-4DAE-9648-1A753A86F968}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D7A37F73-BBA3-4DAE-9648-1A753A86F968}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -50,5 +56,6 @@ Global
 		{803CD13A-D54B-4CEC-A55F-E22AE3D93B3C} = {037440DE-440B-4129-9F7A-09B42D00397E}
 		{3C2D8E01-5580-426A-BDD9-EC59CD98E618} = {0D135C0C-A60B-454A-A2F4-CD74A30E04B0}
 		{2BB12CE5-C867-43BD-AE5D-253FE3248C7F} = {0D135C0C-A60B-454A-A2F4-CD74A30E04B0}
+		{D7A37F73-BBA3-4DAE-9648-1A753A86F968} = {0D135C0C-A60B-454A-A2F4-CD74A30E04B0}
 	EndGlobalSection
 EndGlobal
diff --git a/build.sh b/build.sh
@@ -5,11 +5,11 @@ for path in src/*/project.json; do
     dotnet build ${dirname} -c Release
 done
 
-# for path in test/Serilog.Tests/project.json; do
-    # dirname="$(dirname "${path}")"
-    # dotnet build ${dirname} -f netcoreapp1.0 -c Release
-    # dotnet test ${dirname} -f netcoreapp1.0  -c Release
-# done
+for path in test/Serilog.Tests/project.json; do
+    dirname="$(dirname "${path}")"
+    dotnet build ${dirname} -f netcoreapp1.0 -c Release
+    dotnet test ${dirname} -f netcoreapp1.0  -c Release
+done
 
 for path in test/Serilog.PerformanceTests/project.json; do
     dirname="$(dirname "${path}")"

diff --git a/test/Serilog.PerformanceTests/MessageTemplateParserTests.cs b/test/Serilog.PerformanceTests/MessageTemplateParserTests.cs
@@ -45,7 +45,7 @@ public void Baseline()
         }  
 
         [Benchmark]
-        public void DefaultConsoleOutputTemplate()
+        public void ParseDefaultConsoleOutputTemplate()
         {
             var template = _parser.Parse(DefaultConsoleOutputTemplate);
         }