Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Update EventSource* Tests for EventPipe #16645

Merged
merged 6 commits into from
Feb 28, 2018
Merged

Update EventSource* Tests for EventPipe #16645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a821444
Enable EventSourceTrace test.
brianrob Feb 28, 2018
16469bc
Delete EventSourceSmoke test.
brianrob Feb 28, 2018
4d4d3f1
Mark EventSourceTrace test as priority 0.
brianrob Feb 28, 2018
678e9e3
Disable eventsourcetrace on Windows.
brianrob Feb 28, 2018
50d71f5
test fix
adamsitnik Feb 28, 2018
f7da6a2
I forgot to change the path
adamsitnik Feb 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions tests/issues.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,6 @@
<ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\TypeGeneratorTests\TypeGeneratorTest683\Generated683\*">
<Issue>6707</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)\tracing\eventsourcetrace\**">
<Issue>15919</Issue>
</ExcludeList>
</ItemGroup>

<!-- The following are x86 failures -->
Expand Down Expand Up @@ -1728,7 +1725,7 @@
<!-- The following are tests that fail on Windows -->

<ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(TargetsWindows)' == 'true'">
<ExcludeList Include="$(XunitTestBinBase)\tracing\eventsource**">
<ExcludeList Include="$(XunitTestBinBase)\tracing\eventsourcetrace\eventsourcetrace\eventsourcetrace.cmd">
<Issue>15494</Issue>
</ExcludeList>
</ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion tests/src/dirs.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
<DisabledProjects Include="Performance\Scenario\JitBench\unofficial_dotnet\JitBench.csproj" /> <!-- no official build support for SDK-style netcoreapp2.0 projects -->
<DisabledProjects Include="Loader\classloader\generics\regressions\DD117522\Test.csproj" />
<DisabledProjects Include="Loader\classloader\generics\GenericMethods\VSW491668.csproj" /> <!-- issue 5501 -->
<DisabledProjects Include="tracing\eventsource*\**" /> <!-- issue 15924 -->
</ItemGroup>

<ItemGroup>
Expand Down
80 changes: 0 additions & 80 deletions tests/src/tracing/eventsourcesmoke/EventSourceSmoke.cs
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions tests/src/tracing/eventsourcesmoke/eventsourcesmoke.csproj
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion tests/src/tracing/eventsourcetrace/EventSourceTrace.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using Tracing.Tests.Common;
using System.Diagnostics.Tracing;
using Microsoft.Diagnostics.Tracing;
using Microsoft.Diagnostics.Tracing.Etlx;
using Microsoft.Diagnostics.Tracing.Parsers;
using Microsoft.Diagnostics.Tracing.Parsers.Clr;

Expand Down Expand Up @@ -77,7 +78,7 @@ static int Main(string[] args)

Console.WriteLine("\tStart: Processing events from file.");
int msgCount = 0;
using (var trace = TraceEventDispatcher.GetDispatcherFromFileName(netPerfFile.Path))
using (var trace = new TraceLog(TraceLog.CreateFromEventPipeDataFile(netPerfFile.Path)).Events.GetSource())
{
var names = new HashSet<string>();

Expand Down
2 changes: 1 addition & 1 deletion tests/src/tracing/eventsourcetrace/eventsourcetrace.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<CLRTestKind>BuildAndRun</CLRTestKind>
<DefineConstants>$(DefineConstants);STATIC</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<CLRTestPriority>1</CLRTestPriority>
<CLRTestPriority>0</CLRTestPriority>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"></PropertyGroup>
Expand Down