diff options
| author | Andy Clement <aclement@pivotal.io> | 2020-08-13 16:06:08 -0700 |
|---|---|---|
| committer | Andy Clement <aclement@pivotal.io> | 2020-08-13 16:06:08 -0700 |
| commit | 7e8259b0d477e65e5f957dd1ee86eba270aca267 (patch) | |
| tree | f946a4fd106b17927a2f90fa6ebfa315503bd407 /testing | |
| parent | 1e2096910fc68c01f0be634721020ceee88d797c (diff) | |
| download | aspectj-7e8259b0d477e65e5f957dd1ee86eba270aca267.tar.gz aspectj-7e8259b0d477e65e5f957dd1ee86eba270aca267.zip | |
Making tests behave on 11
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/src/test/java/org/aspectj/testing/OutputSpec.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/testing/src/test/java/org/aspectj/testing/OutputSpec.java b/testing/src/test/java/org/aspectj/testing/OutputSpec.java index 62a22cb80..ca7d0f232 100644 --- a/testing/src/test/java/org/aspectj/testing/OutputSpec.java +++ b/testing/src/test/java/org/aspectj/testing/OutputSpec.java @@ -36,7 +36,12 @@ public class OutputSpec { private boolean matchesThisVm(String vm) { // vm might be 1.2, 1.3, 1.4, 1.5 or 1.9 possibly with a '+' in there // For now assume + is attached to there only being one version, like "9+" - if (vm.contains(LangUtil.getVmVersionString())) { + // System.out.println("Checking "+vm+" for "+LangUtil.getVmVersionString()); + String v = LangUtil.getVmVersionString(); + if (v.endsWith(".0")) { + v = v.substring(0,v.length()-2); + } + if (vm.contains(v)) { return true; } if (vm.endsWith("+")) { |