Skip instrumentation tests on bytecode interpreter

Author: msimacek

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/PythonTests.java

@@ -48,15 +48,16 @@
 import java.util.Collections;
 import java.util.Map;
 
-import com.oracle.truffle.api.strings.TruffleString;
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Engine;
 import org.graalvm.polyglot.PolyglotException;
 import org.graalvm.polyglot.Value;
 import org.junit.Assert;
+import org.junit.Assume;
 
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.runtime.PythonContext;
+import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.runtime.PythonParser.ParserMode;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.test.interop.JavaInteropTest;
@@ -68,6 +69,7 @@
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.source.Source.LiteralBuilder;
+import com.oracle.truffle.api.strings.TruffleString;
 
 public class PythonTests {
     static {
@@ -132,6 +134,10 @@ public static void closeContext() {
         }
     }
 
+    public static void skipOnBytecodeInterpreter() {
+        Assume.assumeFalse(PythonOptions.EnableBytecodeInterpreter.getDefaultValue());
+    }
+
     public static void assertBenchNoError(Path scriptName, String[] args) {
         final ByteArrayOutputStream byteArrayErr = new ByteArrayOutputStream();
         final ByteArrayOutputStream byteArrayOut = new ByteArrayOutputStream();

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/debug/PythonDebugTest.java

@@ -83,6 +83,7 @@ public void before() {
         newBuilder.allowAllAccess(true);
         PythonTests.closeContext();
         tester = new DebuggerTester(newBuilder);
+        PythonTests.skipOnBytecodeInterpreter();
     }
 
     @After

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/interop/ReadAndWriteVariableTagsTests.java

@@ -50,6 +50,7 @@
 import org.graalvm.polyglot.Engine;
 import org.graalvm.polyglot.Instrument;
 import org.graalvm.polyglot.Source;
+import org.junit.Before;
 import org.junit.Test;
 
 import com.oracle.graal.python.nodes.PNode;
@@ -77,6 +78,11 @@ private static Context newContext(Engine engine) {
         return Context.newBuilder().allowExperimentalOptions(true).allowAllAccess(true).engine(engine).build();
     }
 
+    @Before
+    public void before() {
+        PythonTests.skipOnBytecodeInterpreter();
+    }
+
     @Test
     public void testInModule() throws Exception {
         String code = "a = 0\n" +

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/interop/StandardTagsTests.java

@@ -45,6 +45,14 @@
 
 import java.util.HashMap;
 
+import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.Engine;
+import org.graalvm.polyglot.Instrument;
+import org.graalvm.polyglot.Source;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
 import com.oracle.graal.python.nodes.PNode;
 import com.oracle.graal.python.nodes.function.InnerRootNode;
 import com.oracle.graal.python.test.PythonTests;
@@ -59,13 +67,6 @@
 import com.oracle.truffle.api.library.LibraryFactory;
 import com.oracle.truffle.api.nodes.Node;
 
-import org.graalvm.polyglot.Context;
-import org.graalvm.polyglot.Engine;
-import org.graalvm.polyglot.Instrument;
-import org.graalvm.polyglot.Source;
-import org.junit.Assert;
-import org.junit.Test;
-
 @SuppressWarnings("all")
 public class StandardTagsTests extends PythonTests {
 
@@ -75,6 +76,11 @@ private static Context newContext(Engine engine) {
         return Context.newBuilder().allowExperimentalOptions(true).allowAllAccess(true).engine(engine).build();
     }
 
+    @Before
+    public void before() {
+        PythonTests.skipOnBytecodeInterpreter();
+    }
+
     @Test
     public void testRootBodyTagModule() throws Exception {
         String code = "import time\n" +