src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorldTest.java

*** 21,37 ****
   * questions.
   */
  package org.graalvm.compiler.hotspot.test;
  
  import static org.graalvm.compiler.core.GraalCompilerOptions.ExitVMOnException;
- 
- import org.junit.Test;
- 
  import org.graalvm.compiler.core.test.GraalCompilerTest;
  import org.graalvm.compiler.hotspot.CompileTheWorld;
- import org.graalvm.compiler.hotspot.CompileTheWorld.Config;
  import org.graalvm.compiler.hotspot.HotSpotGraalCompiler;
  
  import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
  import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider;
  
  /**
--- 21,37 ----
   * questions.
   */
  package org.graalvm.compiler.hotspot.test;
  
  import static org.graalvm.compiler.core.GraalCompilerOptions.ExitVMOnException;
  import org.graalvm.compiler.core.test.GraalCompilerTest;
  import org.graalvm.compiler.hotspot.CompileTheWorld;
  import org.graalvm.compiler.hotspot.HotSpotGraalCompiler;
+ import org.graalvm.compiler.options.OptionKey;
+ import org.graalvm.compiler.options.OptionValues;
+ import org.graalvm.util.EconomicMap;
+ import org.junit.Test;
  
  import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
  import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider;
  
  /**
*** 39,51 ****
   */
  public class CompileTheWorldTest extends GraalCompilerTest {
  
      @Test
      public void testJDK() throws Throwable {
!         boolean originalSetting = ExitVMOnException.getValue();
          // Compile a couple classes in rt.jar
          HotSpotJVMCIRuntimeProvider runtime = HotSpotJVMCIRuntime.runtime();
          System.setProperty(CompileTheWorld.LIMITMODS_PROPERTY_NAME, "java.base");
!         new CompileTheWorld(runtime, (HotSpotGraalCompiler) runtime.getCompiler(), CompileTheWorld.SUN_BOOT_CLASS_PATH, new Config("Inline=false"), 1, 5, null, null, true).compile();
!         assert ExitVMOnException.getValue() == originalSetting;
      }
  }
--- 39,53 ----
   */
  public class CompileTheWorldTest extends GraalCompilerTest {
  
      @Test
      public void testJDK() throws Throwable {
!         boolean originalSetting = ExitVMOnException.getValue(getInitialOptions());
          // Compile a couple classes in rt.jar
          HotSpotJVMCIRuntimeProvider runtime = HotSpotJVMCIRuntime.runtime();
          System.setProperty(CompileTheWorld.LIMITMODS_PROPERTY_NAME, "java.base");
!         OptionValues initialOptions = getInitialOptions();
!         EconomicMap<OptionKey<?>, Object> compilationOptions = CompileTheWorld.parseOptions("Inline=false");
!         new CompileTheWorld(runtime, (HotSpotGraalCompiler) runtime.getCompiler(), CompileTheWorld.SUN_BOOT_CLASS_PATH, 1, 5, null, null, true, initialOptions, compilationOptions).compile();
!         assert ExitVMOnException.getValue(initialOptions) == originalSetting;
      }
  }