buildtool test task for R2022b+

Author: scivision

.github/workflows/composite-nomex/action.yml

@@ -35,7 +35,7 @@ runs:
     uses: matlab-actions/run-build@v2
     with:
       startup-options: ${{ matrix.startup-options }}
-      tasks: test_java
+      tasks: test_java test_java_exe
 
 
   - name: Exe Test (>= R2024b)

buildfile.m

@@ -3,41 +3,46 @@
 
 plan = buildplan(localfunctions);
 
-cnomex = ~HasTag("exe") & ~HasTag("mex") & ~HasTag("java") & ~HasTag("java_exe") & ~HasTag("python");
+sel = ~HasTag("exe") & ~HasTag("java") & ~HasTag("java_exe") & ~HasTag("python");
 if ispc()
-  cnomex = cnomex & ~HasTag("unix");
+  sel = sel & ~HasTag("unix");
 else
-  cnomex = cnomex & ~HasTag("windows");
+  sel = sel & ~HasTag("windows");
 end
 
 reportDir = fullfile(plan.RootFolder, ".buildtool");
 pkg_root = fullfile(plan.RootFolder, "+stdlib");
 test_root = fullfile(plan.RootFolder, "test");
 
 if ~isMATLABReleaseOlderThan("R2023b")
-  plan("clean") = matlab.buildtool.tasks.CleanTask;
+  plan("clean") = matlab.buildtool.tasks.CleanTask();
 end
 
 if isMATLABReleaseOlderThan("R2024b")
 
-  plan("test_main") = matlab.buildtool.Task(Actions=@(context) test_main(context, cnomex));
+  plan("test_main") = matlab.buildtool.Task(Actions=@(context) test_main(context, sel));
+  plan("test_java") = matlab.buildtool.tasks.TestTask(test_root, Tag="java");
+
+  plan("test") = matlab.buildtool.Task(Dependencies=["test_main", "test_java"]);
 
   if isMATLABReleaseOlderThan('R2023b')
     return
   end
 
-  plan("test_java") = matlab.buildtool.tasks.TestTask(test_root, Tag="java");
+  plan("test_java_exe") = matlab.buildtool.tasks.TestTask(test_root, Tag="java_exe", Dependencies="exe");
   plan("test_exe") = matlab.buildtool.tasks.TestTask(test_root, Tag="exe", Dependencies="exe");
 
+  plan("test").Dependencies = [plan("test").Dependencies, "test_java_exe", "test_exe"];
+
 elseif isMATLABReleaseOlderThan("R2025a")
   % Matlab == R2024b
-  plan("test:main") = matlab.buildtool.Task(Actions=@(context) test_main(context, cnomex));
+  plan("test:main") = matlab.buildtool.Task(Actions=@(context) test_main(context, sel));
 
 else
   % Matlab >= R2025a
   plan("test:main") = matlab.buildtool.tasks.TestTask(...
     test_root, Description="Test non-MEX targets", ...
-    Selector=cnomex, ...
+    Selector=sel, ...
     SourceFiles=pkg_root, ...
     RunOnlyImpactedTests=stdlib.checkout_license("MATLAB Test"), ...
     TestResults=reportDir + "/TestResults_nomex.xml", Strict=true);

test_main.m

@@ -1,7 +1,7 @@
 function test_main(context, sel)
 arguments
   context = []
-  sel = ~HasTag("exe") & ~HasTag("mex") & ~HasTag("java_exe")
+  sel = ~HasTag("exe") & ~HasTag("java_exe")
 end
 
 import matlab.unittest.TestRunner