daniel/Ryujinx
1
0
Fork 0
mirror of https://github.com/Ryujinx/Ryujinx.git synced 2025-06-28 15:40:47 -07:00
Code Issues Packages Projects Releases Wiki Activity

Use upstream unicorn for Ryujinx.Tests.Unicorn (#3771)

Browse Source 
* unicorn: Add modified ver of unicorns const gen

* unicorn: Use upstream consts

These consts were generated from the dev branch of unicorn

* unicorn: Split common consts into multiple enums

* unicorn: Remove arch prefix from consts

* unicorn: Add new windows dll

Windows 10 - MSVC x64 shared build

* unicorn: Use absolute path for const generation

* unicorn: Remove fspcr patch

* unicorn: Fix using the wrong file extension

For some reason _NativeLibraryExtension evaluates to ".so" even on Windows.

* unicorn: Add linux shared object again

* unicron: Add DllImportResolver

* unicorn: Try to import unicorn using an absolute path

* unicorn: Add clean target

* unicorn: Replace IsUnicornAvailable() methods

* unicorn: Skip tests instead of silently passing them if unicorn is missing

* unicorn: Write error message to stderr

* unicorn: Make Interface static

* unicron: Include prefixed unicorn libs (libunicorn.so)

Co-authored-by: merry <git@mary.rs>

* unicorn: Add lib prefix to shared object for linux

Co-authored-by: merry <git@mary.rs>
This commit is contained in:
TSRBerry
2022-11-20 20:18:21 +01:00
committed by GitHub
parent ab0491817e
commit 905a191e28
27 changed files with 1165 additions and 718 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Ryujinx.Tests/Cpu/CpuTest.cs
View File

@ -38,14 +38,11 @@ namespace Ryujinx.Tests.Cpu
private bool _usingMemory;
static CpuTest()
[OneTimeSetUp]
public void OneTimeSetup()
{
_unicornAvailable = UnicornAArch64.IsAvailable();
if (!_unicornAvailable)
{
Console.WriteLine("WARNING: Could not find Unicorn.");
}
Assume.That(_unicornAvailable, "Unicorn is not available");
}
[SetUp]
@ -610,4 +607,4 @@ namespace Ryujinx.Tests.Cpu
return rnd & 0x800FFFFFFFFFFFFFul;
}
}
}
}

9
Ryujinx.Tests/Cpu/CpuTest32.cs
View File

@ -33,14 +33,11 @@ namespace Ryujinx.Tests.Cpu
private bool _usingMemory;
static CpuTest32()
[OneTimeSetUp]
public void OneTimeSetup()
{
_unicornAvailable = UnicornAArch32.IsAvailable();
if (!_unicornAvailable)
{
Console.WriteLine("WARNING: Could not find Unicorn.");
}
Assume.That(_unicornAvailable, "Unicorn is not available");
}
[SetUp]

12
Ryujinx.Tests/Ryujinx.Tests.csproj
View File

@ -34,7 +34,17 @@
</ItemGroup>
<Target Name="CopyUnicorn" AfterTargets="Build">
<Copy SourceFiles="..\Ryujinx.Tests.Unicorn\libs\$(TargetOS)\unicorn.dll" DestinationFolder="$(OutputPath)" ContinueOnError="true" />
<ItemGroup>
<UnicornLib Include="..\Ryujinx.Tests.Unicorn\libs\$(TargetOS)\*unicorn.*"/>
</ItemGroup>
<Copy SourceFiles="@(UnicornLib)" DestinationFolder="$(OutputPath)" ContinueOnError="true" />
</Target>
<Target Name="CleanUnicorn" BeforeTargets="Clean">
<ItemGroup>
<UnicornLib Include="$(OutputPath)/unicorn.*"/>
</ItemGroup>
<Delete Files="@(UnicornLib)" />
</Target>
</Project>