diff options
| author | Andy Clement <aclement@pivotal.io> | 2017-09-22 15:17:54 -0700 |
|---|---|---|
| committer | Andy Clement <aclement@pivotal.io> | 2017-09-22 15:17:54 -0700 |
| commit | faac3d84e254d747076dc258f9a059839946a274 (patch) | |
| tree | 80b1490eb76c266169efed6a6e1ef70e4cacf328 /weaver/testsrc | |
| parent | e136805cb6db5243307cb6579cd2cfe84f87c2e6 (diff) | |
| download | aspectj-faac3d84e254d747076dc258f9a059839946a274.tar.gz aspectj-faac3d84e254d747076dc258f9a059839946a274.zip | |
various changes to make more tests pass on Java9
Diffstat (limited to 'weaver/testsrc')
| -rw-r--r-- | weaver/testsrc/org/aspectj/weaver/bcel/WeaveTestCase.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/WeaveTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/WeaveTestCase.java index e3d62faa3..109d7ed06 100644 --- a/weaver/testsrc/org/aspectj/weaver/bcel/WeaveTestCase.java +++ b/weaver/testsrc/org/aspectj/weaver/bcel/WeaveTestCase.java @@ -29,6 +29,7 @@ import org.aspectj.apache.bcel.generic.InvokeInstruction; import org.aspectj.apache.bcel.generic.Type; import org.aspectj.testing.util.TestUtil; import org.aspectj.util.FileUtil; +import org.aspectj.util.LangUtil; import org.aspectj.weaver.Advice; import org.aspectj.weaver.BcweaverTests; import org.aspectj.weaver.ShadowMunger; @@ -115,7 +116,12 @@ public abstract class WeaveTestCase extends TestCase { gen = classType.getLazyClassGen(); // new LazyClassGen(classType); } try { - checkClass(gen, outDirPath, outName + ".txt"); + File possibleVmSpecificFile = new File(TESTDATA_DIR,outName + "." + LangUtil.getVmVersionString()+".txt"); + if (possibleVmSpecificFile.exists()) { + checkClass(gen, outDirPath, outName + "." + LangUtil.getVmVersionString()+".txt"); + } else { + checkClass(gen, outDirPath, outName + ".txt"); + } if (runTests) { System.out.println("*******RUNNING: " + outName + " " + name + " *******"); TestUtil.runMain(makeClassPath(outDirPath), name); |