From 511a5e6cbffbf7789ed3552aa2f51658ed257001 Mon Sep 17 00:00:00 2001 From: Leonid Mesnik <lmesnik@openjdk.org> Date: Fri, 17 Jun 2016 13:05:53 +0300 Subject: [PATCH] 8157831: JVMCI tests should not be executed on linux-arm32 Reviewed-by: dpochepk, dholmes --- test/jtreg-ext/requires/VMProps.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/test/jtreg-ext/requires/VMProps.java b/test/jtreg-ext/requires/VMProps.java index ef7de8faf39..468868a7989 100644 --- a/test/jtreg-ext/requires/VMProps.java +++ b/test/jtreg-ext/requires/VMProps.java @@ -52,10 +52,29 @@ public class VMProps implements Callable<Map<String, String>> { 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. */