Merge pull request #6714 from Arthapz/improve-tests

nfc(c++ modules) improve tests

4 files changed, 17 insertions, 22 deletions

diff --git a/tests/projects/c++/modules/test_base.lua b/tests/projects/c++/modules/test_base.lua
index 214f221a4..3571ad108 100644
--- a/tests/projects/c++/modules/test_base.lua
+++ b/tests/projects/c++/modules/test_base.lua
@@ -9,26 +9,22 @@ GCC_MIN_VER = "11"
 MSVC_MIN_VER = "14.29"
 
 function _build(check_outdata)
+    local flags = ""
+    if ci_is_running() then
+     flags = "-vD"
+    end
     if check_outdata then
         local outdata
-        if ci_is_running() then
-            outdata = os.iorun("xmake -rvD")
-        else
-            outdata = os.iorun("xmake -rv")
-        end
+        outdata = os.iorun("xmake -r " ..  flags)
         if outdata then
             if outdata:find(check_outdata.str, 1, true) then
                 raise(check_outdata.format_string, outdata)
             end
         end
     else
-        if ci_is_running() then
-            os.run("xmake -rvD")
-        else
-            os.run("xmake -r")
-        end
+        os.run("xmake -r " .. flags)
     end
-    local outdata = os.iorun("xmake")
+    local outdata = os.iorun("xmake " .. flags)
     if outdata then
         if outdata:find("compiling", 1, true) or outdata:find("linking", 1, true) or outdata:find("generating", 1, true) then
             raise("Modules incremental compilation does not work\n%s", outdata)
diff --git a/tests/projects/c++/modules/test_dependency_scanner.lua b/tests/projects/c++/modules/test_dependency_scanner.lua
index 6bedb7718..406ac76f4 100644
--- a/tests/projects/c++/modules/test_dependency_scanner.lua
+++ b/tests/projects/c++/modules/test_dependency_scanner.lua
@@ -6,13 +6,13 @@ GCC_MIN_VER = "11"
 MSVC_MIN_VER = "14.29"
 
 function _build(platform, toolchain_name, runtimes, policies, flags)
-    os.exec("xmake f" .. platform .. "--toolchain=" .. toolchain_name .. runtimes .. "-c --yes " .. policies .. " --foo=n")
-    local outdata
+    local flags = ""
     if ci_is_running() then
-        outdata = os.iorun("xmake -rvD")
-    else
-        outdata = os.iorun("xmake -rv")
+     flags = "-vD"
     end
+    os.exec("xmake f" .. platform .. "--toolchain=" .. toolchain_name .. runtimes .. "-c --yes " .. policies .. " --foo=n" .. " " .. flags)
+    local outdata
+    outdata = os.iorun("xmake -r " .. flags)
     if outdata then
         if outdata:find("FOO") then
             raise("Modules dependency scanner update does not work\n%s", outdata)
diff --git a/tests/projects/c++/modules/test_duplicate_modules.lua b/tests/projects/c++/modules/test_duplicate_modules.lua
index f6b7fd43b..98a27d739 100644
--- a/tests/projects/c++/modules/test_duplicate_modules.lua
+++ b/tests/projects/c++/modules/test_duplicate_modules.lua
@@ -6,13 +6,13 @@ GCC_MIN_VER = "11"
 MSVC_MIN_VER = "14.29"
 
 function _build()
+    local flags = ""
+    if ci_is_running() then
+     flags = "-vD"
+    end
     try {
         function ()
-            if ci_is_running() then
-                os.run("xmake -rvD")
-            else
-                os.run("xmake -r")
-            end
+            os.run("xmake -r " .. flags)
         end,
         catch {
             function (errors)
diff --git a/tests/projects/c++/modules/test_headerunits.lua b/tests/projects/c++/modules/test_headerunits.lua
index 17f6373c0..610838312 100644
--- a/tests/projects/c++/modules/test_headerunits.lua
+++ b/tests/projects/c++/modules/test_headerunits.lua
@@ -1,5 +1,4 @@
 inherit("test_base")
-import("utils.ci.is_running", {alias = "ci_is_running"})
 
 GCC_MIN_VER = "11"
 MSVC_MIN_VER = "14.30"