test/java/lang/ModuleLayer/LayerAndLoadersTest.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,33 ****
   * questions.
   */
  
  /**
   * @test
!  * @library /lib/testlibrary
   * @modules jdk.compiler
!  * @build LayerAndLoadersTest CompilerUtils ModuleUtils
   * @run testng LayerAndLoadersTest
   * @summary Tests for java.lang.ModuleLayer@defineModulesWithXXX methods
   */
  
  import java.io.IOException;
--- 21,33 ----
   * questions.
   */
  
  /**
   * @test
!  * @library /lib/testlibrary /test/lib
   * @modules jdk.compiler
!  * @build LayerAndLoadersTest jdk.test.lib.compiler.CompilerUtils ModuleUtils
   * @run testng LayerAndLoadersTest
   * @summary Tests for java.lang.ModuleLayer@defineModulesWithXXX methods
   */
  
  import java.io.IOException;
*** 46,55 ****
--- 46,56 ----
  import java.util.Map;
  import java.util.Optional;
  import java.util.ServiceLoader;
  import java.util.Set;
  import java.util.stream.Collectors;
+ import jdk.test.lib.compiler.CompilerUtils;
  
  import org.testng.annotations.BeforeTest;
  import org.testng.annotations.Test;
  import static org.testng.Assert.*;