Mercurial > hg > truffle
diff truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/instrument/InstrumentationTestNodes.java @ 22241:14e6dfb1ef05
Truffle/Testing: massive rework of tests to accommodate recent instrumentation change with respect to "applyInstrumentation"
- Caused by lack of a "vm" known to the Accessor during most testing, making the Instrumenter unavailable, which is now required to create a CallTarget
- Modified the Instrumenter/Accessor with a static field that can be reflectively "poked" with a vm value for testing
- Create a pair of methods to globally enable/disable testing mode to modify that static field and restore it when tests complete.
| author | Michael Van De Vanter <michael.van.de.vanter@oracle.com> |
|---|---|
| date | Tue, 22 Sep 2015 20:31:19 -0700 |
| parents | 68a0c3dcea10 |
| children | b73205fe7cf3 |
line wrap: on
line diff
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/instrument/InstrumentationTestNodes.java Tue Sep 22 20:25:58 2015 -0700 +++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/instrument/InstrumentationTestNodes.java Tue Sep 22 20:31:19 2015 -0700 @@ -23,8 +23,6 @@ package com.oracle.truffle.api.test.instrument; import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import com.oracle.truffle.api.CallTarget; import com.oracle.truffle.api.frame.VirtualFrame; @@ -166,11 +164,6 @@ public boolean isCloningAllowed() { return true; } - - @Override - public void applyInstrumentation() { - super.applyInstrumentation(body); - } } /** @@ -203,18 +196,6 @@ public boolean isCloningAllowed() { return true; } - - @Override - public void applyInstrumentation() { - Method method; - try { - method = Instrumenter.class.getDeclaredMethod("applyInstrumentation", Node.class); - method.setAccessible(true); - method.invoke(instrumenter, body); - } catch (NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { - throw new RuntimeException("InstrumentationTestNodes"); - } - } } static class TestAdvancedInstrumentCounterRoot extends AdvancedInstrumentRoot {