diff options
author | aclement <aclement> | 2005-05-04 14:25:16 +0000 |
---|---|---|
committer | aclement <aclement> | 2005-05-04 14:25:16 +0000 |
commit | 7e56f52c8d248aa7b20d27ec53e5f860ae07eeef (patch) | |
tree | 56be122a9a1904f66cbf5510fb37070c0376e0d9 | |
parent | 529dacebd3f9fd9eac2ca7caecf3cbadc103e495 (diff) | |
download | aspectj-7e56f52c8d248aa7b20d27ec53e5f860ae07eeef.tar.gz aspectj-7e56f52c8d248aa7b20d27ec53e5f860ae07eeef.zip |
Guard running the declare annotation weaving message test unless on a 1.5 vm
-rw-r--r-- | ajde/testsrc/org/aspectj/ajde/ShowWeaveMessagesTestCase.java | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/ajde/testsrc/org/aspectj/ajde/ShowWeaveMessagesTestCase.java b/ajde/testsrc/org/aspectj/ajde/ShowWeaveMessagesTestCase.java index a4add872f..2ea90022a 100644 --- a/ajde/testsrc/org/aspectj/ajde/ShowWeaveMessagesTestCase.java +++ b/ajde/testsrc/org/aspectj/ajde/ShowWeaveMessagesTestCase.java @@ -69,6 +69,20 @@ public class ShowWeaveMessagesTestCase extends AjdeTestCase { regenerate = false; } + private static boolean is13VMOrGreater = true; + private static boolean is14VMOrGreater = true; + private static boolean is15VMOrGreater = false; + + static { + String vm = System.getProperty("java.vm.version"); + if (vm.startsWith("1.3")) { + is14VMOrGreater = false; + } else if (vm.startsWith("1.5")) { + is15VMOrGreater = true; + } + } + + private CompilerAdapter compilerAdapter; public static final String PROJECT_DIR = "WeaveInfoMessagesTest"; @@ -161,6 +175,7 @@ public class ShowWeaveMessagesTestCase extends AjdeTestCase { * Weave 'declare @type, @constructor, @method and @field' and check the weave messages that come out. */ public void testWeaveMessagesDeclareAnnotation() { + if (!is15VMOrGreater) return; // annotation classes won't be about pre 15 if (debugTests) System.out.println("\ntestWeaveMessagesDeclareAnnotation: Building with Six.lst"); compilerAdapter = new CompilerAdapter(); compilerAdapter.showInfoMessages(true); |