test:nojavamex

Author: scivision

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

@@ -11,4 +11,4 @@ runs:
     uses: matlab-actions/run-build@v2
     with:
       startup-options: ${{ matrix.startup-options }} -logfile ${{ matrix.release }}-${{ runner.os }}-test.log
-      tasks: ${{ matrix.release < 'R2024b' && !startsWith(matrix.release, 'latest') && 'test_mex' || 'test:mex' }}
+      tasks: ${{ matrix.release < 'R2024b' && !startsWith(matrix.release, 'latest') && 'test_mex test_exe' || 'test:mex test:exe' }}

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

@@ -11,7 +11,7 @@ runs:
     uses: matlab-actions/run-build@v2
     with:
       startup-options: ${{ matrix.startup-options }}
-      tasks: test:nomex ${{ contains(matrix.startup-options, '-nojvm') && '' || 'test:exe' }}
+      tasks: ${{ contains(matrix.startup-options, '-nojvm') && 'test:nojavamex' || 'test:nomex' }}
 
 
   - name: Non-Mex Test (< R2024b)

buildfile.m

@@ -13,18 +13,21 @@
 
 cnomex = ~HasTag("exe") & ~HasTag("mex");
 cmex = ~HasTag("exe") & HasTag("mex");
+cnojavamex = ~HasTag("java") & cmex;
 
 if isMATLABReleaseOlderThan("R2024b")
 
   plan("test_exe") = matlab.buildtool.tasks.TestTask("test", Tag="exe", Dependencies="exe");
   plan("test_nomex") = matlab.buildtool.Task(Actions=@(context) legacy_test(context, cnomex), Dependencies="clean");
   plan("test_mex") = matlab.buildtool.Task(Actions=@(context) legacy_test(context, cmex), Dependencies="mex");
+  plan("test_nojavamex") = matlab.buildtool.Task(Actions=@(context) legacy_test(context, cnojavamex), Dependencies="clean");
 
 elseif isMATLABReleaseOlderThan("R2025a")
 
   plan("test:exe")   = matlab.buildtool.tasks.TestTask("test", Tag="exe", Dependencies="exe");
   plan("test:nomex") = matlab.buildtool.Task(Actions=@(context) legacy_test(context, cnomex), Dependencies="clean");
   plan("test:mex")   = matlab.buildtool.Task(Actions=@(context) legacy_test(context, cmex), Dependencies="mex");
+  plan("test:nojavamex") = matlab.buildtool.Task(Actions=@(context) legacy_test(context, cnojavamex), Dependencies="clean");
 
 else
   % can't use SourceFiles= if "mex" Task was run, even if plan("test").DisableIncremental = true;
@@ -40,6 +43,10 @@
                          Selector=cmex, ...
                          Dependencies="mex", TestResults="TestResults_mex.xml", Strict=false);
 
+  plan("test:nojavamex") = matlab.buildtool.tasks.TestTask("test", ...
+                         Selector=cnojavamex, ...
+                         Dependencies="clean", TestResults="TestResults_nojavamex.xml", Strict=false);
+
 end
 
 td = plan.RootFolder + "/test";

test/TestHash.m

@@ -5,14 +5,8 @@
       {'sha-256', '2cf24dba5fb0a30e26e83b2ac5b9e29e1b161e5c1fa7425e73043362938b9824'}}
 end
 
-methods(TestClassSetup)
-function java_required(tc)
-tc.assumeTrue(stdlib.has_java())
-end
-end
-
 
-methods (Test)
+methods (Test, TestTags="java")
 
 
 function test_hash_text(tc, Ph)

test/TestJava.m

@@ -4,14 +4,8 @@
 Ps = {"."}
 end
 
-methods(TestClassSetup)
-function java_required(tc)
-tc.assumeTrue(stdlib.has_java())
-end
-end
-
 
-methods(Test)
+methods(Test, TestTags="java")
 
 function test_inode(tc)
 tc.assumeFalse(ispc(), "not for Windows")

test/TestSubprocess.m

@@ -5,14 +5,8 @@
 lang_in = {"cpp", "fortran"}
 end
 
-methods(TestClassSetup)
-function java_required(tc)
-tc.assumeTrue(stdlib.has_java())
-end
-end
-
 
-methods (Test, TestTags="exe")
+methods (Test, TestTags=["exe", "java"])
 
 function test_stdout_stderr(tc, lang_out)
 import matlab.unittest.constraints.IsFile