From c42ae97bb21a3cc406867d499e87faea4574972a Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Fri, 27 Jan 2023 22:35:57 +0100 Subject: [PATCH] Restore native test run --- .github/workflows/tests.yml | 9 ++++++--- Source/ThirdParty/nethost/nethost.Build.cs | 2 -- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 96e105707..c50bb106c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -30,11 +30,12 @@ jobs: - name: Build run: | ./GenerateProjectFiles.sh -vs2022 - ./Development/Scripts/Linux/CallBuildTool.sh -build -log -arch=x64 -platform=Linux -configuration=Development -buildtargets=FlaxTestsTarget -BuildBindingsOnly + ./Development/Scripts/Linux/CallBuildTool.sh -build -log -arch=x64 -platform=Linux -configuration=Development -buildtargets=FlaxTestsTarget dotnet msbuild Source/Tools/Flax.Build.Tests/Flax.Build.Tests.csproj /m /t:Restore,Build /p:Configuration=Debug /p:Platform=AnyCPU /nologo dotnet msbuild Source/Tools/Flax.Build.Tests/Flax.Build.Tests.csproj /m /t:Restore,Build /p:Configuration=Debug /p:Platform=AnyCPU /nologo - name: Test run: | + ${GITHUB_WORKSPACE}/Binaries/Editor/Linux/Development/FlaxTests dotnet test -f net7.0 Binaries/Tests/Flax.Build.Tests.dll cp Binaries/Editor/Linux/Development/FlaxEngine.CSharp.dll Binaries/Tests cp Binaries/Editor/Linux/Development/FlaxEngine.CSharp.runtimeconfig.json Binaries/Tests @@ -42,7 +43,8 @@ jobs: dotnet test -f net7.0 Binaries/Tests/FlaxEngine.CSharp.dll - name: Test UseLargeWorlds run: | - ./Development/Scripts/Linux/CallBuildTool.sh -build -log -arch=x64 -platform=Linux -configuration=Development -buildtargets=FlaxTestsTarget -UseLargeWorlds=true -BuildBindingsOnly + ./Development/Scripts/Linux/CallBuildTool.sh -build -log -arch=x64 -platform=Linux -configuration=Development -buildtargets=FlaxTestsTarget -UseLargeWorlds=true + ${GITHUB_WORKSPACE}/Binaries/Editor/Linux/Development/FlaxTests # Tests on Windows tests-windows: @@ -65,11 +67,12 @@ jobs: - name: Build run: | .\GenerateProjectFiles.bat -vs2022 - .\Development\Scripts\Windows\CallBuildTool.bat -build -log -arch=x64 -platform=Windows -configuration=Development -buildtargets=FlaxTestsTarget -BuildBindingsOnly + .\Development\Scripts\Windows\CallBuildTool.bat -build -log -arch=x64 -platform=Windows -configuration=Development -buildtargets=FlaxTestsTarget dotnet msbuild Source\Tools\Flax.Build.Tests\Flax.Build.Tests.csproj /m /t:Restore,Build /p:Configuration=Debug /p:Platform=AnyCPU /nologo dotnet msbuild Source\Tools\Flax.Build.Tests\Flax.Build.Tests.csproj /m /t:Restore,Build /p:Configuration=Debug /p:Platform=AnyCPU /nologo - name: Test run: | + .\Binaries\Editor\Win64\Development\FlaxTests.exe dotnet test -f net7.0 Binaries\Tests\Flax.Build.Tests.dll copy Binaries\Editor\Win64\Development\FlaxEngine.CSharp.dll Binaries\Tests /Y copy Binaries\Editor\Win64\Development\FlaxEngine.CSharp.runtimeconfig.json Binaries\Tests /Y diff --git a/Source/ThirdParty/nethost/nethost.Build.cs b/Source/ThirdParty/nethost/nethost.Build.cs index 00020a0db..a33790d08 100644 --- a/Source/ThirdParty/nethost/nethost.Build.cs +++ b/Source/ThirdParty/nethost/nethost.Build.cs @@ -4,8 +4,6 @@ using System.IO; using System; using Flax.Build; using Flax.Build.NativeCpp; -using Microsoft.Win32; -using System.Linq; /// /// Module for nethost (.NET runtime host library).