test/tools/launcher/modules/classpath/JavaClassPathTest.java

rev 17315 : 8181335: remove packageless CompilerUtils
Reviewed-by: duke

*** 1,7 ****
  /*
!  * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 28,37 ****
--- 28,38 ----
  import java.util.ArrayList;
  import java.util.List;
  import java.util.Map;
  import java.util.spi.ToolProvider;
  
+ import jdk.test.lib.compiler.CompilerUtils;
  import jdk.testlibrary.OutputAnalyzer;
  import org.testng.annotations.BeforeTest;
  import org.testng.annotations.DataProvider;
  import org.testng.annotations.Test;
  
*** 40,53 ****
  
  /**
   * @test
   * @bug 8168205
   * @summary Test the default class path if -Djava.class.path is set
!  * @library /lib/testlibrary
   * @modules jdk.compiler
   *          jdk.jartool
!  * @build CompilerUtils jdk.testlibrary.*
   * @run testng JavaClassPathTest
   */
  
  public class JavaClassPathTest {
      private static final Path SRC_DIR = Paths.get(System.getProperty("test.src"),
--- 41,54 ----
  
  /**
   * @test
   * @bug 8168205
   * @summary Test the default class path if -Djava.class.path is set
!  * @library /lib/testlibrary /test/lib
   * @modules jdk.compiler
   *          jdk.jartool
!  * @build jdk.test.lib.compiler.CompilerUtils jdk.testlibrary.*
   * @run testng JavaClassPathTest
   */
  
  public class JavaClassPathTest {
      private static final Path SRC_DIR = Paths.get(System.getProperty("test.src"),