test/jdk/modules/scenarios/automaticmodules/RunWithAutomaticModules.java

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

*** 1,7 ****
  /*
!  * Copyright (c) 2015, 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) 2015, 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.
*** 21,42 ****
   * questions.
   */
  
  /**
   * @test
!  * @library /lib/testlibrary
   * @modules jdk.compiler
!  * @build RunWithAutomaticModules CompilerUtils JarUtils
   *        jdk.testlibrary.ProcessTools
   * @run testng RunWithAutomaticModules
   * @summary Runs tests that make use of automatic modules
   */
  
  import java.nio.file.Files;
  import java.nio.file.Path;
  import java.nio.file.Paths;
  
  import static jdk.testlibrary.ProcessTools.*;
  
  import org.testng.annotations.Test;
  import static org.testng.Assert.*;
  
--- 21,43 ----
   * questions.
   */
  
  /**
   * @test
!  * @library /lib/testlibrary /test/lib
   * @modules jdk.compiler
!  * @build RunWithAutomaticModules jdk.test.lib.compiler.CompilerUtils JarUtils
   *        jdk.testlibrary.ProcessTools
   * @run testng RunWithAutomaticModules
   * @summary Runs tests that make use of automatic modules
   */
  
  import java.nio.file.Files;
  import java.nio.file.Path;
  import java.nio.file.Paths;
  
+ import jdk.test.lib.compiler.CompilerUtils;
  import static jdk.testlibrary.ProcessTools.*;
  
  import org.testng.annotations.Test;
  import static org.testng.Assert.*;