< prev index next >

test/jtreg-ext/requires/VMProps.java

Print this page

        

@@ -350,22 +350,35 @@
      * A simple check for docker support
      *
      * @return true if docker is supported in a given environment
      */
     protected String dockerSupport() {
-        // currently docker testing is only supported for Linux-x64 and Linux-ppc64le
+        boolean isSupported = false;
+        if (Platform.isLinux()) {
+           // currently docker testing is only supported for Linux, 
+           // on x64, AArch64 and ppc64le platforms
+
         String arch = System.getProperty("os.arch");
-        if (! (Platform.isLinux() && (Platform.isX64() || arch.equals("ppc64le")))) {
-            return "false";
+
+           if (Platform.isX64()) {
+              isSupported = true;
+           }
+           else if (Platform.isAArch64()) {
+              isSupported = true;
+           }
+           else if (arch.equals("ppc64le")) {
+              isSupported = true;
+           }
         }
 
-        boolean isSupported;
+        if (isSupported) {
         try {
             isSupported = checkDockerSupport();
         } catch (Exception e) {
             isSupported = false;
         }
+        }
 
         return (isSupported) ? "true" : "false";
     }
 
     private boolean checkDockerSupport() throws IOException, InterruptedException {
< prev index next >