test/jtreg-ext/requires/VMProps.java
changeset 39198 050eff9d3bcf
parent 37400 7a596e23c0da
child 39199 ec6fd961811c
--- a/test/jtreg-ext/requires/VMProps.java	Sat Jun 11 00:12:26 2016 +0000
+++ b/test/jtreg-ext/requires/VMProps.java	Fri Jun 17 13:05:53 2016 +0300
@@ -52,10 +52,29 @@
         map.put("vm.flavor", vmFlavor());
         map.put("vm.compMode", vmCompMode());
         map.put("vm.bits", vmBits());
+        map.put("vm.simpleArch", vmArch());
         dump(map);
         return map;
     }
 
+
+    /**
+     * @return vm.simpleArch value of "os.simpleArch" property of tested JDK.
+     */
+    protected String vmArch() {
+        String arch = System.getProperty("os.arch");
+        if (arch.equals("x86_64") || arch.equals("amd64")) {
+            return "x64";
+        }
+        else if (arch.contains("86")) {
+            return "x86";
+        } else {
+            return arch;
+        }
+    }
+
+
+
     /**
      * @return VM type value extracted from the "java.vm.name" property.
      */