summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraclement <aclement>2011-09-14 16:16:47 +0000
committeraclement <aclement>2011-09-14 16:16:47 +0000
commit88235739345c01e4c173950488b7b92fedb8646a (patch)
tree9f3dc9dd8df7b6bf4fd604296c6087be8fa86f88
parent363c363afffc7152e96da039ef767db111bb8245 (diff)
downloadaspectj-88235739345c01e4c173950488b7b92fedb8646a.tar.gz
aspectj-88235739345c01e4c173950488b7b92fedb8646a.zip
can run tests on 1.7 vm
-rw-r--r--testing/newsrc/org/aspectj/testing/AjcTest.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/testing/newsrc/org/aspectj/testing/AjcTest.java b/testing/newsrc/org/aspectj/testing/AjcTest.java
index 4192f9db7..3973ac119 100644
--- a/testing/newsrc/org/aspectj/testing/AjcTest.java
+++ b/testing/newsrc/org/aspectj/testing/AjcTest.java
@@ -28,6 +28,7 @@ public class AjcTest {
private static boolean is14VMOrGreater = true;
private static boolean is15VMOrGreater = false;
private static boolean is16VMOrGreater = false;
+ private static boolean is17VMOrGreater = false;
static { // matching logic is also in org.aspectj.util.LangUtil
String vm = System.getProperty("java.version"); // JLS 20.18.7
@@ -40,6 +41,10 @@ public class AjcTest {
} else if (vm.startsWith("1.6")) {
is15VMOrGreater = true;
is16VMOrGreater = true;
+ } else if (vm.startsWith("1.7")) {
+ is15VMOrGreater = true;
+ is16VMOrGreater = true;
+ is17VMOrGreater=true;
}
}
@@ -81,6 +86,7 @@ public class AjcTest {
if (vmLevel.equals("1.4")) canRun = is14VMOrGreater;
if (vmLevel.equals("1.5")) canRun = is15VMOrGreater;
if (vmLevel.equals("1.6")) canRun = is16VMOrGreater;
+ if (vmLevel.equals("1.7")) canRun = is17VMOrGreater;
if (!canRun) {
System.out.println("***SKIPPING TEST***" + getTitle()+ " needs " + getVmLevel()
+ ", currently running on " + System.getProperty("java.vm.version"));