< prev index next >
hotspot/test/runtime/6981737/Test6981737.java
Print this page
@@ -36,16 +36,17 @@
* property. Before jdk7, they should be "Sun Micro..." and "1.0".
* In jdk7 onwards they should be "Oracle..." and "1.<major_version>"
*/
public static void main(String[] args) throws Exception {
- String version = verifyProperty("java.version", "[0-9]+\\.[0-9]+\\..*");
- String major_version_spec = version.split("\\.")[1];
+ String version = verifyProperty("java.version", "[0-9]+[\\\\.[0-9]+]*\\-.*");
+ String version_tokens[] = version.split("-|\\.");
+ String major_version_spec = version_tokens[0];
int major_version = new Integer(major_version_spec).intValue();
String vendor_re = "Oracle Corporation";
- String vm_spec_version_re = "1\\." + major_version_spec;
+ String vm_spec_version_re = major_version_spec;
if (major_version < 7) {
vendor_re = "Sun Microsystems Inc\\.";
vm_spec_version_re = "1\\.0";
}
verifyProperty("java.vendor", vendor_re);
< prev index next >