windows: cpu_arch java optional

Author: scivision

+stdlib/cpu_arch.m

@@ -1,9 +1,13 @@
 %% CPU_ARCH get the CPU architecture
-% requires: java
+% optional: java
 
 function arch = cpu_arch()
 
-arch = javaSystemProperty("os.arch");
+if ispc()
+  arch = string(System.Runtime.InteropServices.RuntimeInformation.OSArchitecture);
+else
+  arch = javaSystemProperty("os.arch");
+end
 
 end
 

test/TestJava.m

@@ -50,10 +50,6 @@ function test_java_api(tc)
 tc.assertGreaterThanOrEqual(v, 8, "Java API >= 8 is required for Matlab-stdlib")
 end
 
-function test_cpu_arch(tc)
-arch = stdlib.cpu_arch();
-tc.verifyGreaterThan(strlength(arch), 0)
-end
 
 function test_os_version(tc)
 [os, ver] = stdlib.os_version();

test/TestSys.m

@@ -30,5 +30,13 @@ function test_username(tc)
 tc.verifyGreaterThan(strlength(u), 0)
 end
 
+
+function test_cpu_arch(tc)
+tc.assumeTrue(ispc() || stdlib.has_java())
+
+arch = stdlib.cpu_arch();
+tc.verifyGreaterThan(strlength(arch), 0)
+end
+
 end
 end