Merge pull request #4336 from mikezackles/test-compile-fail

Support testing for expected compilation failure instead of expected compilation success

2 files changed, 9 insertions, 7 deletions

diff --git a/tests/actions/test/xmake.lua b/tests/actions/test/xmake.lua
index 4823ca5da..641b4c764 100644
--- a/tests/actions/test/xmake.lua
+++ b/tests/actions/test/xmake.lua
@@ -17,4 +17,4 @@ target("test_10")
     set_kind("binary")
     set_default(false)
     add_files("src/compile.cpp")
-    add_tests("compile", {build_only = true})
+    add_tests("compile", {build_should_fail = true})
diff --git a/xmake/actions/test/main.lua b/xmake/actions/test/main.lua
index 56a52ad0b..5958325bc 100644
--- a/xmake/actions/test/main.lua
+++ b/xmake/actions/test/main.lua
@@ -35,8 +35,8 @@ import("actions.build.main", {rootdir = os.programdir(), alias = "build_action"}
 function _do_test_target(target, opt)
     opt = opt or {}
 
-    -- test build only
-    if opt.build_only then
+    -- early out: results were computed during build
+    if opt.build_should_fail then
         return opt.passed, opt.errors
     end
 
@@ -384,10 +384,12 @@ function main()
     local targetnames = {}
     for _, testinfo in table.orderpairs(tests) do
         local targetname = testinfo.target:name()
-        if testinfo.build_only then
-            local passed, errors = _try_build_target(targetname)
-            testinfo.passed = passed
-            testinfo.errors = errors
+        if testinfo.build_should_fail then
+            local built, _ = _try_build_target(targetname)
+            testinfo.passed = not built
+            if built then
+                testinfo.errors = "Build succeeded when failure was expected"
+            end
         else
             table.insert(targetnames, targetname)
         end