From 3d88746060312c809f998f8a48e9100322c98de9 Mon Sep 17 00:00:00 2001 From: SirLynix Date: Thu, 29 Dec 2022 12:07:52 +0100 Subject: [PATCH] Move unit tests to the unittests asset folder --- assets/{tests_version.txt => unittests_version.txt} | 0 tests/UnitTests/resources.cpp | 2 +- xmake.lua | 2 +- xmake/rules/download_assets.lua | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename assets/{tests_version.txt => unittests_version.txt} (100%) diff --git a/assets/tests_version.txt b/assets/unittests_version.txt similarity index 100% rename from assets/tests_version.txt rename to assets/unittests_version.txt diff --git a/tests/UnitTests/resources.cpp b/tests/UnitTests/resources.cpp index 9ea1fd50e..5e871d40d 100644 --- a/tests/UnitTests/resources.cpp +++ b/tests/UnitTests/resources.cpp @@ -8,7 +8,7 @@ std::filesystem::path GetAssetDir() if (!std::filesystem::is_directory(dir) && std::filesystem::is_directory("../.." / dir)) dir = "../.." / dir; - return dir / "tests"; + return dir / "unittests"; }(); return resourceDir; diff --git a/xmake.lua b/xmake.lua index 8df18de83..08ea65be5 100644 --- a/xmake.lua +++ b/xmake.lua @@ -185,7 +185,7 @@ if has_config("examples") then end if has_config("tests") then - add_rules("download.assets.tests") + add_rules("download.assets.unittests") end set_allowedplats("windows", "mingw", "linux", "macosx") diff --git a/xmake/rules/download_assets.lua b/xmake/rules/download_assets.lua index ba3efc743..4b51f1e13 100644 --- a/xmake/rules/download_assets.lua +++ b/xmake/rules/download_assets.lua @@ -39,4 +39,4 @@ local function downloadAssetsRule(name) end downloadAssetsRule("examples") -downloadAssetsRule("tests") \ No newline at end of file +downloadAssetsRule("unittests") \ No newline at end of file