improve doctest

3 files changed, 10 insertions, 12 deletions

diff --git a/tests/projects/c++/doctest/tests/test_1.cpp b/tests/projects/c++/doctest/tests/test_1.cpp
index 84b726cf2..394238d2b 100644
--- a/tests/projects/c++/doctest/tests/test_1.cpp
+++ b/tests/projects/c++/doctest/tests/test_1.cpp
@@ -1,6 +1,6 @@
 #include "doctest/doctest.h"
 
-int factorial(int number) {
+static int factorial(int number) {
     return number <= 1 ? number : factorial(number - 1) * number;
 }
 
diff --git a/tests/projects/c++/doctest/tests/test_2.cpp b/tests/projects/c++/doctest/tests/test_2.cpp
index 8ab727d06..1edd56e49 100644
--- a/tests/projects/c++/doctest/tests/test_2.cpp
+++ b/tests/projects/c++/doctest/tests/test_2.cpp
@@ -1,6 +1,6 @@
 #include "doctest/doctest.h"
 
-int factorial(int number) {
+static int factorial(int number) {
     return number <= 1 ? number : factorial(number - 1) * number;
 }
 
diff --git a/tests/projects/c++/doctest/xmake.lua b/tests/projects/c++/doctest/xmake.lua
index b241c784d..17be8d163 100644
--- a/tests/projects/c++/doctest/xmake.lua
+++ b/tests/projects/c++/doctest/xmake.lua
@@ -5,14 +5,12 @@ add_requires("doctest")
 target("doctest")
     set_kind("binary")
     add_files("src/*.cpp")
-    add_packages("doctest")
-    add_tests("test1", {files = "tests/test_1.cpp",
-                        remove_files = "src/main.cpp",
-                        languages = "c++11",
-                        defines = "DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN"})
-    add_tests("test2", {files = "tests/test_2.cpp",
-                        remove_files = "src/main.cpp",
-                        languages = "c++11",
-                        defines = "DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN"})
-
+    for _, testfile in ipairs(os.files("tests/*.cpp")) do
+        add_tests(path.basename(testfile), {
+            files = testfile,
+            remove_files = "src/main.cpp",
+            languages = "c++11",
+            packages = "doctest",
+            defines = "DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN"})
+    end