From d156602da7c5327a975ad854f9f95d49d569e544 Mon Sep 17 00:00:00 2001 From: Persson-dev Date: Fri, 16 Feb 2024 10:40:26 +0100 Subject: [PATCH] improve tests --- test/{mainTest.cpp => test_jordan.cpp} | 0 test/test_vect.cpp | 31 ++++++++++++++++++++ xmake.lua | 39 ++++++++++++++++++++------ 3 files changed, 61 insertions(+), 9 deletions(-) rename test/{mainTest.cpp => test_jordan.cpp} (100%) create mode 100644 test/test_vect.cpp diff --git a/test/mainTest.cpp b/test/test_jordan.cpp similarity index 100% rename from test/mainTest.cpp rename to test/test_jordan.cpp diff --git a/test/test_vect.cpp b/test/test_vect.cpp new file mode 100644 index 0000000..66a261b --- /dev/null +++ b/test/test_vect.cpp @@ -0,0 +1,31 @@ +#include "Vect.h" +#include + +int main() { + Vect vect1 {{3, 2, { + 1, 2, + 3, 4, + 5, 6, + }}}; + Vect vect2 {{3, 2, { + 1, 0, + 0, 0, + 0, 1, + }}}; + Vect vect3 {{3, 2, { + 1, 3, + 3, 7, + 5, 11, + }}}; + Vect vect4 {{3, 2, { + 1, 0, + 0, 0, + 1, 11, + }}}; + assert(vect1 == vect3); + assert(vect2 == vect4); + assert(vect1 != vect2); + assert(vect2 != vect3); + assert(vect3 != vect4); + return 0; +} \ No newline at end of file diff --git a/xmake.lua b/xmake.lua index 0cd4b3f..1744eb4 100644 --- a/xmake.lua +++ b/xmake.lua @@ -1,22 +1,43 @@ add_rules("mode.debug", "mode.release") +set_languages("c++17") + +-- Solver Library target("Pivot") - set_kind("binary") + set_kind("static") add_files("src/*.cpp") + remove_files("src/main.cpp") + + + + + +-- Solver Main +target("PivotMain") set_rundir("$(projectdir)/matricies") - set_languages("c++17") + add_files("src/main.cpp") + add_deps("Pivot") + set_default(true) -target("PivotTest") - set_kind("binary") - add_files("test/*.cpp", "src/Matrix.cpp") - add_includedirs("src") - set_default(false) - add_tests("compile_and_run") - set_rundir("$(projectdir)/matricies") +-- Solver tests +for _, file in ipairs(os.files("test/test_*.cpp")) do + local name = path.basename(file) + target(name) + set_kind("binary") + add_files("test/" .. name .. ".cpp") + set_rundir("$(projectdir)/matricies") + add_includedirs("src") + + set_default(false) + + add_deps("Pivot") + + add_tests("compile_and_run") +end -- -- If you want to known more usage about xmake, please see https://xmake.io