From ab6f397df60c7ff6116705b7d045a990979176aa Mon Sep 17 00:00:00 2001 From: Benoit Germain Date: Fri, 21 Mar 2025 16:53:25 +0100 Subject: Adjusting MSVC files to ease unit testing * Everything assumes there is a _LuaVersions folder containing all supported Lua versions (binaries, libs and headers) alongside the Lanes.sln location * After that the solutions to build the Lua binaries themselves will appear too for reference (mainly because their output folders will be configured accordingly) --- unit_tests/Catch2.runsettings | 29 ------- unit_tests/UnitTests.vcxproj | 150 ++++++++++++++++++++--------------- unit_tests/UnitTests.vcxproj.filters | 6 +- unit_tests/UnitTests.vcxproj.user | 143 --------------------------------- 4 files changed, 88 insertions(+), 240 deletions(-) delete mode 100644 unit_tests/Catch2.runsettings delete mode 100644 unit_tests/UnitTests.vcxproj.user (limited to 'unit_tests') diff --git a/unit_tests/Catch2.runsettings b/unit_tests/Catch2.runsettings deleted file mode 100644 index fcf7f5a..0000000 --- a/unit_tests/Catch2.runsettings +++ /dev/null @@ -1,29 +0,0 @@ - - - - - --list-tests --verbosity high - 300000 - - - UnitTests - - - on - - - Combine - - - Solution - . - - \ No newline at end of file diff --git a/unit_tests/UnitTests.vcxproj b/unit_tests/UnitTests.vcxproj index 7da7155..5226907 100644 --- a/unit_tests/UnitTests.vcxproj +++ b/unit_tests/UnitTests.vcxproj @@ -45,28 +45,28 @@ Debug 5.4 Win32 - - Debug LuaJIT + + Release LuaJIT Prospero - - Debug LuaJIT + + Release LuaJIT Win32 - - Debug LuaJIT + + Release LuaJIT x64 - - Debug MoonJIT + + Release MoonJIT Prospero - - Debug MoonJIT + + Release MoonJIT Win32 - - Debug MoonJIT + + Release MoonJIT x64 @@ -143,10 +143,10 @@ true - + true - + true @@ -157,83 +157,103 @@ $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false - + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false - + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false - + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false - + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false @@ -252,7 +272,7 @@ true Console lua54.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) - $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) @@ -271,7 +291,7 @@ true Console lua53.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) - $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) @@ -290,7 +310,7 @@ true Console lua53.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) - $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) @@ -309,7 +329,7 @@ true Console lua52.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) - $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) @@ -328,7 +348,7 @@ true Console lua52.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) - $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) @@ -347,7 +367,7 @@ true Console lua51.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) - $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) @@ -366,10 +386,10 @@ true Console lua51.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) - $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) - + Use _pch.hpp @@ -385,10 +405,10 @@ true Console lua51.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) - $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform) + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) - + Use _pch.hpp @@ -398,13 +418,13 @@ Level3 $(SolutionDir)..\..\..\MoonJIT\src;$(SolutionDir).. stdcpp20 - MultiThreadedDebugDLL + MultiThreadedDLL true Console lua51.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) - $(SolutionDir)..\..\..\MoonJIT\bin\$(Platform) + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) @@ -422,7 +442,7 @@ true Console - $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) lua54.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) @@ -464,7 +484,7 @@ true Console - $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) lua53.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) @@ -482,7 +502,7 @@ true Console - $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) lua53.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) @@ -545,7 +565,7 @@ true Console - $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) lua52.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) @@ -563,7 +583,7 @@ true Console - $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) lua52.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) @@ -626,7 +646,7 @@ true Console - $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) lua51.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) @@ -644,7 +664,7 @@ true Console - $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) lua51.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) @@ -692,7 +712,7 @@ - + Use _pch.hpp @@ -707,13 +727,13 @@ true Console - $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform) + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) lua51.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) - + Use _pch.hpp @@ -723,18 +743,18 @@ Level3 $(SolutionDir)..\..\..\MoonJIT\src;$(SolutionDir).. stdcpp20 - MultiThreadedDebugDLL + MultiThreadedDLL true Console - $(SolutionDir)..\..\..\MoonJIT\bin\$(Platform) + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) lua51.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) - + Use _pch.hpp @@ -755,7 +775,7 @@ - + Use _pch.hpp @@ -792,7 +812,7 @@ true true lua54.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) - $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) @@ -809,7 +829,7 @@ Console true true - $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) lua54.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) @@ -846,8 +866,8 @@ NotUsing NotUsing NotUsing - NotUsing - NotUsing + NotUsing + NotUsing NotUsing NotUsing NotUsing @@ -861,10 +881,10 @@ NotUsing NotUsing NotUsing - NotUsing - NotUsing - NotUsing - NotUsing + NotUsing + NotUsing + NotUsing + NotUsing NotUsing NotUsing NotUsing @@ -879,8 +899,8 @@ NotUsing NotUsing NotUsing - NotUsing - NotUsing + NotUsing + NotUsing NotUsing NotUsing NotUsing @@ -894,10 +914,10 @@ NotUsing NotUsing NotUsing - NotUsing - NotUsing - NotUsing - NotUsing + NotUsing + NotUsing + NotUsing + NotUsing NotUsing NotUsing NotUsing @@ -920,8 +940,8 @@ Create Create Create - Create - Create + Create + Create Create Create Create @@ -937,16 +957,16 @@ Create Create Create - Create - Create - Create - Create + Create + Create + Create + Create Create Create - + diff --git a/unit_tests/UnitTests.vcxproj.filters b/unit_tests/UnitTests.vcxproj.filters index eb02d19..3b45009 100644 --- a/unit_tests/UnitTests.vcxproj.filters +++ b/unit_tests/UnitTests.vcxproj.filters @@ -107,11 +107,11 @@ Scripts\linda - - Catch2 - Make + + Catch2 + \ No newline at end of file diff --git a/unit_tests/UnitTests.vcxproj.user b/unit_tests/UnitTests.vcxproj.user deleted file mode 100644 index d3fc335..0000000 --- a/unit_tests/UnitTests.vcxproj.user +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - $(SolutionDir) - WindowsLocalDebugger - - - - - $(SolutionDir)Lanes - WindowsLocalDebugger - - - $(SolutionDir) - WindowsLocalDebugger - - - $(SolutionDir) - WindowsLocalDebugger - - - $(SolutionDir) - WindowsLocalDebugger - - - $(SolutionDir) - WindowsLocalDebugger - - - $(SolutionDir) - WindowsLocalDebugger - - - $(SolutionDir) - WindowsLocalDebugger - - - $(SolutionDir) - WindowsLocalDebugger - - - $(SolutionDir) - WindowsLocalDebugger - - - $(SolutionDir) - WindowsLocalDebugger - - - $(SolutionDir) - WindowsLocalDebugger - - - $(SolutionDir) - WindowsLocalDebugger - - - - - $(SolutionDir) - WindowsLocalDebugger - - - - - $(SolutionDir)Lanes - WindowsLocalDebugger - - - - - $(SolutionDir)Lanes - WindowsLocalDebugger - - - - - $(SolutionDir) - WindowsLocalDebugger - - - - - $(SolutionDir) - WindowsLocalDebugger - - - - - $(SolutionDir)Lanes - WindowsLocalDebugger - - - - - $(SolutionDir)Lanes - WindowsLocalDebugger - - - - - $(SolutionDir) - WindowsLocalDebugger - - - $(SolutionDir) - WindowsLocalDebugger - - - $(SolutionDir)Lanes - WindowsLocalDebugger - - - $(SolutionDir)Lanes - WindowsLocalDebugger - - - $(SolutionDir) - WindowsLocalDebugger - - - $(SolutionDir) - WindowsLocalDebugger - - - $(SolutionDir)Lanes - WindowsLocalDebugger - - - $(SolutionDir)Lanes - WindowsLocalDebugger - - - $(SolutionDir) - WindowsLocalDebugger - - - $(SolutionDir)Lanes - WindowsLocalDebugger - - \ No newline at end of file -- cgit v1.2.3-55-g6feb