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

*** 35,45 ****
  import java.util.List;
  import java.util.Map;
  import java.util.regex.Matcher;
  import java.util.regex.Pattern;
  
! import org.graalvm.compiler.serviceprovider.GraalServices;
  import org.graalvm.util.CollectionsUtil;
  import org.junit.Assume;
  
  /**
   * Utility methods for spawning a VM in a subprocess during unit tests.
--- 35,45 ----
  import java.util.List;
  import java.util.Map;
  import java.util.regex.Matcher;
  import java.util.regex.Pattern;
  
! import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
  import org.graalvm.util.CollectionsUtil;
  import org.junit.Assume;
  
  /**
   * Utility methods for spawning a VM in a subprocess during unit tests.
*** 247,257 ****
              output.add(line);
          }
          return new Subprocess(command, process.waitFor(), output);
      }
  
!     private static final boolean isJava8OrEarlier = GraalServices.Java8OrEarlier;
  
      private static boolean hasArg(String optionName) {
          if (optionName.equals("-cp") || optionName.equals("-classpath")) {
              return true;
          }
--- 247,257 ----
              output.add(line);
          }
          return new Subprocess(command, process.waitFor(), output);
      }
  
!     private static final boolean isJava8OrEarlier = JavaVersionUtil.Java8OrEarlier;
  
      private static boolean hasArg(String optionName) {
          if (optionName.equals("-cp") || optionName.equals("-classpath")) {
              return true;
          }