|
|
@@ -28,6 +28,7 @@ public class AjcTest { |
|
|
|
private static boolean is13VMOrGreater = true; |
|
|
|
private static boolean is14VMOrGreater = true; |
|
|
|
private static boolean is15VMOrGreater = false; |
|
|
|
private static boolean is16VMOrGreater = false; |
|
|
|
|
|
|
|
static { // matching logic is also in org.aspectj.util.LangUtil |
|
|
|
String vm = System.getProperty("java.version"); // JLS 20.18.7 |
|
|
@@ -37,6 +38,9 @@ public class AjcTest { |
|
|
|
is14VMOrGreater = false; |
|
|
|
} else if (vm.startsWith("1.5")) { |
|
|
|
is15VMOrGreater = true; |
|
|
|
} else if (vm.startsWith("1.6")) { |
|
|
|
is15VMOrGreater = true; |
|
|
|
is16VMOrGreater = true; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
@@ -78,6 +82,7 @@ public class AjcTest { |
|
|
|
boolean canRun = true; |
|
|
|
if (vmLevel.equals("1.4")) canRun = is14VMOrGreater; |
|
|
|
if (vmLevel.equals("1.5")) canRun = is15VMOrGreater; |
|
|
|
if (vmLevel.equals("1.6")) canRun = is16VMOrGreater; |
|
|
|
if (!canRun) { |
|
|
|
System.out.println("***SKIPPING TEST***" + getTitle()+ " needs " + getVmLevel() |
|
|
|
+ ", currently running on " + System.getProperty("java.vm.version")); |