simplify test_main.m

Author: scivision

AGENTS.md

@@ -44,7 +44,7 @@ These rules apply under the namespace "stdlib" (directory +stdlib/) and all its
 
 - The code syntax must work for Matlab >= R2020b
 - The code must not require any Matlab toolboxes, only base Matlab functionality
-- Prohibited to use Matlab factory function "isMATLABReleaseOlderThan()" as it is slow. Instead we use stdlib.matlabOlderThan() which is like 200x faster than isMATLABReleaseOlderThan() and works for Matlab >= R2016b
+- Prohibited to use Matlab factory function "isMATLABReleaseOlderThan()" as it is slow, except in ./test_main.m or ./buildfile.m. Instead we use stdlib.matlabOlderThan() which is like 200x faster than isMATLABReleaseOlderThan() and works for Matlab >= R2016b
 - When an exception is encountered, we generally desire that the code return an "empty" value of the appropriate type. In certain cases we may throw or rethrow an error.
 - where the output represents a filesystem path, the output should be a string type if any input is string type, otherwise char type.
 

scripts/test_matlab_versions.py

@@ -38,6 +38,6 @@ def test_matlab_version(version):
     elif version >= "2019a":
         cmd = lcmd + "matlab -batch test_main"
     else:
-        cmd = lcmd + "matlab -r 'test_main; exit'"
+        cmd = lcmd + "matlab -batch 'test_main'"
 
     subprocess.check_call(cmd, shell=True, cwd=R)

test_main.m

@@ -46,34 +46,14 @@ function test_main(context, sel)
 
 rtags = releaseTestTags();
 
-try
-  suite = testsuite(test_root, 'Tag', rtags, 'InvalidFileFoundAction', 'error');
-catch e
-  if ~strcmp(e.identifier, 'MATLAB:InputParser:UnmatchedParameter')
-    rethrow(e)
-  end
-
-  try
-    suite = testsuite(test_root, 'Tag', rtags);
-  catch e
-    switch e.identifier
-      case {'MATLAB:expectedScalartext', 'MATLAB:expectedScalar'}
-        suite = testsuite(test_root);
-
-        assert(numel(rtags) > 0, 'No test tags found for this Matlab release')
-        ts = HasTag(rtags(1));
-        if numel(rtags) > 1
-          for t = rtags(2:end)
-            ts = ts | HasTag(t);
-          end
-        end
-        sel = sel & ts;
-    otherwise
-      rethrow(e)
-    end
-  end
+if isMATLABReleaseOlderThan("R2022b")
+  eact = {};
+else
+  eact = {'InvalidFileFoundAction', 'error'};
 end
 
+suite = testsuite(test_root, 'Tag', rtags, eact{:});
+
 % selectIf takes the subset of suite tests that meet 'sel' conditions
 suite = suite.selectIf(sel);