Allow experimental options for engines only in the isolate tests

Author: timfel

graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/EngineOptionsTests.java

@@ -53,7 +53,7 @@ public class EngineOptionsTests {
     @Test
     public void engineOptions() {
         assumeFalse(IS_WINDOWS);
-        Engine engine = Engine.newBuilder("python").allowExperimentalOptions(true).build();
+        Engine engine = Engine.create("python");
 
         assertEquals("java", doit(engine, null));
         assertEquals("java", doit(engine, "java"));

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

@@ -58,7 +58,7 @@ public class PythonTests {
     static final PrintStream errStream = new PrintStream(errArray);
     static final PrintStream outStream = new PrintStream(outArray);
 
-    private static final Engine engine = Engine.newBuilder("python").allowExperimentalOptions(true).out(PythonTests.outStream).err(PythonTests.errStream).build();
+    private static final Engine engine = Engine.newBuilder("python").out(PythonTests.outStream).err(PythonTests.errStream).build();
     private static Context context = null;
 
     public static Context enterContext(String... newArgs) {

graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/advanced/MultiContextTest.java

@@ -49,7 +49,7 @@
 public class MultiContextTest extends PythonTests {
     @Test
     public void testSharingWithMemoryview() {
-        Engine engine = Engine.newBuilder("python").allowExperimentalOptions(true).build();
+        Engine engine = Engine.create("python");
         for (int i = 0; i < 10; i++) {
             try (Context context = newContext(engine)) {
                 context.eval("python", "memoryview(b'abc')");
@@ -59,7 +59,7 @@ public void testSharingWithMemoryview() {
 
     @Test
     public void testTryCatch() {
-        Engine engine = Engine.newBuilder("python").allowExperimentalOptions(true).build();
+        Engine engine = Engine.create("python");
         for (int i = 0; i < 10; i++) {
             try (Context context = newContext(engine)) {
                 context.eval("python", "last_val = -1\n" +

graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/advanced/NativeExtTest.java

@@ -63,7 +63,7 @@ public static void setUpClass() {
     @Test
     public void testSharingErrorWithCpythonSre() throws InterruptedException {
         // The first context is the one that will use native extensions
-        Engine engine = Engine.newBuilder("python").allowExperimentalOptions(true).build();
+        Engine engine = Engine.create("python");
         Context cextContext = newContext(engine).option("python.IsolateNativeModules", "true").build();
         try {
             cextContext.eval("python", "import _cpython_sre\nassert _cpython_sre.ascii_tolower(88) == 120\n");

graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/advanced/ResourcesTest.java

@@ -73,7 +73,7 @@ public void testResourcesAsHome() {
 
     @Test
     public void testResourcesAlwaysAllowReading() {
-        try (Context context = Context.newBuilder("python").engine(Engine.newBuilder("python").allowExperimentalOptions(true).build()).allowIO(IOAccess.NONE).option("python.PythonHome", "/path/that/does/not/exist").build()) {
+        try (Context context = Context.newBuilder("python").engine(Engine.create("python")).allowIO(IOAccess.NONE).option("python.PythonHome", "/path/that/does/not/exist").build()) {
             String foundHome = context.eval("python", "import email; email.__spec__.origin").asString();
             assertTrue(foundHome, foundHome.contains("python" + File.separator + "python-home"));
         }

graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/advanced/ShutdownTest.java

@@ -162,7 +162,7 @@ public void testJavaThreadNotExecutingPythonAnymore() throws InterruptedExceptio
     }
 
     private static Context createContext() {
-        return Context.newBuilder().engine(Engine.newBuilder("python").allowExperimentalOptions(true).build()).allowExperimentalOptions(true).allowAllAccess(true).option("python.IsolateNativeModules", "true").build();
+        return Context.newBuilder().engine(Engine.create("python")).allowExperimentalOptions(true).allowAllAccess(true).option("python.IsolateNativeModules", "true").build();
     }
 
     private static void loadNativeExtension(Context context) {

graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/basic/HelloWorldTests.java

@@ -54,7 +54,13 @@ public void helloworldAgain() {
     public void usesFrozenModules() {
         final ByteArrayOutputStream byteArray = new ByteArrayOutputStream();
         final PrintStream printStream = new PrintStream(byteArray);
-        try (Context c = Context.newBuilder().engine(Engine.newBuilder("python").allowExperimentalOptions(true).build()).option("log.python.level", "FINE").out(printStream).err(printStream).build()) {
+        try (Context c = Context.newBuilder()
+                        .engine(Engine.newBuilder("python")
+                                        .out(printStream)
+                                        .err(printStream)
+                                        .build())
+                        .option("log.python.level", "FINE")
+                        .build()) {
             c.initialize("python");
         }
         String result = byteArray.toString().replaceAll("\r\n", "\n");

graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/engine/SharedEngineMultithreadingImportsTest.java

@@ -55,7 +55,7 @@ public class SharedEngineMultithreadingImportsTest extends SharedEngineMultithre
     public void testImportsInParallel() throws InterruptedException, ExecutionException {
         ExecutorService executorService = createExecutorService();
         for (int runIndex = 0; runIndex < RUNS_COUNT; runIndex++) {
-            try (Engine engine = Engine.newBuilder("python").allowExperimentalOptions(true).build()) {
+            try (Engine engine = Engine.create("python")) {
                 Task[] tasks = new Task[Runtime.getRuntime().availableProcessors()];
                 Arrays.fill(tasks, (Task) () -> {
                     try (InitializedContext ctx = initContext(engine, new String[0])) {

graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/engine/SharedEngineMultithreadingOSRAndQuickeningTest.java

@@ -136,7 +136,7 @@ def get_buffer():
     public void testOSRAndQuickenInParallel() throws InterruptedException, ExecutionException {
         ExecutorService executorService = createExecutorService();
         InitializedContext[] contexts = new InitializedContext[Runtime.getRuntime().availableProcessors()];
-        try (Engine e = Engine.newBuilder("python").allowExperimentalOptions(true).build()) {
+        try (Engine e = Engine.create("python")) {
             // No point in this test if compiler is enabled and OSR cannot be configured
             Assume.assumeNotNull(e.getOptions().get("engine.OSRCompilationThreshold"));
         }

graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/engine/SharedEngineMultithreadingQuickeningTest.java

@@ -60,7 +60,7 @@ public void testQuickenInParallel() throws InterruptedException, ExecutionExcept
         InitializedContext[] contexts = new InitializedContext[Runtime.getRuntime().availableProcessors()];
         Random random = new Random();
         for (int runIndex = 0; runIndex < RUNS_COUNT; runIndex++) {
-            try (Engine engine = Engine.newBuilder("python").allowExperimentalOptions(true).build()) {
+            try (Engine engine = Engine.create("python")) {
                 for (int i = 0; i < contexts.length; i++) {
                     contexts[i] = initContext(engine, new String[0]);
                 }