improve tests

12 files changed, 3 insertions, 48 deletions

diff --git a/tests/projects/c++/modules/partitions2/test.lua b/tests/projects/c++/modules/partitions2/test.lua
deleted file mode 100644
index e77adc4ae..000000000
--- a/tests/projects/c++/modules/partitions2/test.lua
+++ /dev/null
@@ -1 +0,0 @@
-inherit(".test_stdmodules")
diff --git a/tests/projects/c++/modules/partitions2/xmake.lua b/tests/projects/c++/modules/partitions2/xmake.lua
deleted file mode 100644
index 9e0ab37bb..000000000
--- a/tests/projects/c++/modules/partitions2/xmake.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-add_rules("mode.release", "mode.debug")

-set_languages("c++20")

-

-target("partition2")

-    set_kind("binary")

-    add_files("src/*.cpp", "src/*.mpp")

diff --git a/tests/projects/c++/modules/partitions_implunit/src/BasicPlane.Figures-Point.mpp b/tests/projects/c++/modules/partitions_implunit/src/BasicPlane.Figures-Point.mpp
deleted file mode 100644
index e693edcc0..000000000
--- a/tests/projects/c++/modules/partitions_implunit/src/BasicPlane.Figures-Point.mpp
+++ /dev/null
@@ -1,5 +0,0 @@
-export module BasicPlane.Figures:Point;

-

-export struct Point {

-    int x, y;

-};

diff --git a/tests/projects/c++/modules/partitions_implunit/src/BasicPlane.Figures-Rectangle.cpp b/tests/projects/c++/modules/partitions_implunit/src/BasicPlane.Figures-Rectangle.cpp
deleted file mode 100644
index ca05e05a1..000000000
--- a/tests/projects/c++/modules/partitions_implunit/src/BasicPlane.Figures-Rectangle.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-module;
-
-module BasicPlane.Figures;
-
-int area(const Rectangle& r) { return width(r) * height(r); }
-int height(const Rectangle& r) { return r.ul.y - r.lr.y; }
-int width(const Rectangle& r) { return r.lr.x - r.ul.x; }
diff --git a/tests/projects/c++/modules/partitions_implunit/src/BasicPlane.Figures-Rectangle.mpp b/tests/projects/c++/modules/partitions_implunit/src/BasicPlane.Figures-Rectangle.mpp
deleted file mode 100644
index 84467d480..000000000
--- a/tests/projects/c++/modules/partitions_implunit/src/BasicPlane.Figures-Rectangle.mpp
+++ /dev/null
@@ -1,11 +0,0 @@
-export module BasicPlane.Figures:Rectangle;

-

-import :Point;

-

-export struct Rectangle {

-    Point ul, lr;

-};

-

-export int area(const Rectangle& r);

-export int height(const Rectangle& r);

-export int width(const Rectangle& r);

diff --git a/tests/projects/c++/modules/partitions_implunit/src/BasicPlane.Figures.mpp b/tests/projects/c++/modules/partitions_implunit/src/BasicPlane.Figures.mpp
deleted file mode 100644
index f471e1436..000000000
--- a/tests/projects/c++/modules/partitions_implunit/src/BasicPlane.Figures.mpp
+++ /dev/null
@@ -1,4 +0,0 @@
-export module BasicPlane.Figures;
-
-export import :Point;
-export import :Rectangle;
diff --git a/tests/projects/c++/modules/partitions_implunit/src/ModulesTutorial.cpp b/tests/projects/c++/modules/partitions_implunit/src/ModulesTutorial.cpp
deleted file mode 100644
index 130a5778c..000000000
--- a/tests/projects/c++/modules/partitions_implunit/src/ModulesTutorial.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <iostream>
-
-import BasicPlane.Figures;
-
-int main(int argc, char** argv) {
-    Rectangle r{ {1,8}, {11,3} };
-    std::cout << "area: " << area(r) << '\n';
-    std::cout << "width: " << width(r) << '\n';
-    return 0;
-}
diff --git a/tests/projects/c++/modules/partitions2/src/math.cpp b/tests/projects/c++/modules/partitions_implunit/src/math.cpp
index 3a10c8203..3a10c8203 100644
--- a/tests/projects/c++/modules/partitions2/src/math.cpp
+++ b/tests/projects/c++/modules/partitions_implunit/src/math.cpp
diff --git a/tests/projects/c++/modules/partitions2/src/math.mpp b/tests/projects/c++/modules/partitions_implunit/src/math.mpp
index 9e2552513..9e2552513 100644
--- a/tests/projects/c++/modules/partitions2/src/math.mpp
+++ b/tests/projects/c++/modules/partitions_implunit/src/math.mpp
diff --git a/tests/projects/c++/modules/partitions2/src/math_helpers.mpp b/tests/projects/c++/modules/partitions_implunit/src/math_impl.mpp
index a92cb5e4a..a92cb5e4a 100644
--- a/tests/projects/c++/modules/partitions2/src/math_helpers.mpp
+++ b/tests/projects/c++/modules/partitions_implunit/src/math_impl.mpp
diff --git a/tests/projects/c++/modules/partitions2/src/test.cpp b/tests/projects/c++/modules/partitions_implunit/src/test.cpp
index 8f7f81b2c..8f7f81b2c 100644
--- a/tests/projects/c++/modules/partitions2/src/test.cpp
+++ b/tests/projects/c++/modules/partitions_implunit/src/test.cpp
diff --git a/tests/projects/c++/modules/partitions_implunit/xmake.lua b/tests/projects/c++/modules/partitions_implunit/xmake.lua
index a777846e3..9e0ab37bb 100644
--- a/tests/projects/c++/modules/partitions_implunit/xmake.lua
+++ b/tests/projects/c++/modules/partitions_implunit/xmake.lua
@@ -1,7 +1,6 @@
 add_rules("mode.release", "mode.debug")

 set_languages("c++20")

 

-target("foo")

-    set_kind("static")

-    add_files("src/*.cpp")

-    add_files("src/*.mpp")

+target("partition2")

+    set_kind("binary")

+    add_files("src/*.cpp", "src/*.mpp")