File tree Expand file tree Collapse file tree 6 files changed +15
-8
lines changed
BenchmarkDotNet.Disassembler.x64
tests/BenchmarkDotNet.IntegrationTests Expand file tree Collapse file tree 6 files changed +15
-8
lines changed Original file line number Diff line number Diff line change @@ -36,7 +36,7 @@ public class IntelAsm : Asm
36
36
37
37
public class Arm64Asm : Asm
38
38
{
39
- #if ! CLRMDV1
39
+ #if ! CLRMDV1 // don't include it in ClrMD V1 disassembler that supports only x86 and x64
40
40
public Gee . External . Capstone . Arm64 . Arm64Instruction Instruction { get ; set ; }
41
41
#endif
42
42
}
@@ -52,9 +52,6 @@ public class Map
52
52
[ XmlArrayItem ( nameof ( SourceCode ) , typeof ( SourceCode ) ) ]
53
53
[ XmlArrayItem ( nameof ( Sharp ) , typeof ( Sharp ) ) ]
54
54
[ XmlArrayItem ( nameof ( IntelAsm ) , typeof ( IntelAsm ) ) ]
55
- #if NET6_0_OR_GREATER // we can replace it with !CLRMDV1 when https://github.com/9ee1/Capstone.NET/issues/36 is solved
56
- [ XmlArrayItem ( nameof ( Arm64Asm ) , typeof ( Arm64Asm ) ) ]
57
- #endif
58
55
public SourceCode [ ] SourceCodes { get ; set ; }
59
56
}
60
57
Original file line number Diff line number Diff line change 4
4
<AssemblyTitle >BenchmarkDotNet</AssemblyTitle >
5
5
<TargetFrameworks >netstandard2.0;net6.0</TargetFrameworks >
6
6
<AllowUnsafeBlocks >true</AllowUnsafeBlocks >
7
- <NoWarn >$(NoWarn);1701;1702;1705;1591;3005;NU1702;CS3001;CS3003;CS8002 </NoWarn >
7
+ <NoWarn >$(NoWarn);1701;1702;1705;1591;3005;NU1702;CS3001;CS3003</NoWarn >
8
8
<AssemblyName >BenchmarkDotNet</AssemblyName >
9
9
<PackageId >BenchmarkDotNet</PackageId >
10
10
<RootNamespace >BenchmarkDotNet</RootNamespace >
17
17
</ItemGroup >
18
18
<ItemGroup >
19
19
<PackageReference Include =" CommandLineParser" Version =" 2.4.3" />
20
- <PackageReference Include =" Gee.External.Capstone" Version =" 2.2 .0" />
20
+ <PackageReference Include =" Gee.External.Capstone" Version =" 2.3 .0" />
21
21
<PackageReference Include =" Iced" Version =" 1.17.0" />
22
22
<PackageReference Include =" Microsoft.Diagnostics.Runtime" Version =" 2.2.332302" />
23
23
<PackageReference Include =" Perfolizer" Version =" 0.2.1" />
Original file line number Diff line number Diff line change @@ -51,8 +51,11 @@ public void SendSignal(HostSignal hostSignal)
51
51
52
52
// read the response from Parent process, make the communication blocking
53
53
string acknowledgment = inReader . ReadLine ( ) ;
54
- if ( acknowledgment != Engine . Signals . Acknowledgment )
54
+ if ( acknowledgment != Engine . Signals . Acknowledgment
55
+ && ! ( acknowledgment is null && hostSignal == HostSignal . AfterAll ) ) // an early EOF, but still valid
56
+ {
55
57
throw new NotSupportedException ( $ "Unknown Acknowledgment: { acknowledgment } ") ;
58
+ }
56
59
}
57
60
58
61
public void SendError ( string message ) => outWriter . WriteLine ( $ "{ ValidationErrorReporter . ConsoleErrorPrefix } { message } ") ;
Original file line number Diff line number Diff line change @@ -18,6 +18,9 @@ public CustomBuildConfigurationTests(ITestOutputHelper output) : base(output)
18
18
[ Fact ]
19
19
public void UserCanSpecifyCustomBuildConfiguration ( )
20
20
{
21
+ if ( ContinuousIntegration . IsAppVeyorOnWindows ( ) )
22
+ return ; // timeouts
23
+
21
24
var jobWithCustomConfiguration = Job . Dry . WithCustomBuildConfiguration ( "CUSTOM" ) ;
22
25
23
26
var config = CreateSimpleConfig ( job : jobWithCustomConfiguration ) ;
Original file line number Diff line number Diff line change @@ -12,6 +12,9 @@ public class MonoTests : BenchmarkTestExecutor
12
12
[ FactDotNetCoreOnly ( "UseMonoRuntime option is available in .NET Core only starting from .NET 6" ) ]
13
13
public void Mono70IsSupported ( )
14
14
{
15
+ if ( ContinuousIntegration . IsAppVeyorOnWindows ( ) )
16
+ return ; // timeouts
17
+
15
18
var config = ManualConfig . CreateEmpty ( ) . AddJob ( Job . Dry . WithRuntime ( MonoRuntime . Mono70 ) ) ;
16
19
CanExecute < MonoBenchmark > ( config ) ;
17
20
}
Original file line number Diff line number Diff line change @@ -32,7 +32,8 @@ public static IEnumerable<object[]> GetToolchains()
32
32
yield return new object [ ] { Job . Default . GetToolchain ( ) } ;
33
33
34
34
if ( ! ContinuousIntegration . IsGitHubActionsOnWindows ( ) // no native dependencies
35
- && ! RuntimeInformation . IsMacOSX ( ) ) // currently not supported
35
+ && ! RuntimeInformation . IsMacOSX ( ) // currently not supported
36
+ && ! ContinuousIntegration . IsAppVeyorOnWindows ( ) ) // timeouts
36
37
{
37
38
yield return new object [ ] { NativeAotToolchain . CreateBuilder ( )
38
39
. UseNuGet ( "7.0.0" , "https://api.nuget.org/v3/index.json" )
You can’t perform that action at this time.
0 commit comments