test/jdk/modules/incubator/DefaultImage.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.
*** 23,49 ****
  
  /*
   * @test
   * @bug 8170859
   * @summary Ensure no incubator modules are resolved by default in the image
!  * @library /lib/testlibrary
   * @modules jdk.compiler
!  * @build CompilerUtils
   * @run testng DefaultImage
   */
  
  import java.io.ByteArrayOutputStream;
- import java.io.IOException;
  import java.io.PrintStream;
  import java.lang.module.ModuleDescriptor;
  import java.lang.module.ModuleFinder;
  import java.lang.module.ModuleReference;
  import java.nio.file.Files;
  import java.nio.file.Path;
  import java.nio.file.Paths;
  import java.util.function.Consumer;
  import java.util.stream.Stream;
  
  import org.testng.annotations.BeforeTest;
  import org.testng.annotations.Test;
  
  import static java.nio.charset.StandardCharsets.UTF_8;
--- 23,49 ----
  
  /*
   * @test
   * @bug 8170859
   * @summary Ensure no incubator modules are resolved by default in the image
!  * @library /lib/testlibrary /test/lib
   * @modules jdk.compiler
!  * @build jdk.test.lib.compiler.CompilerUtils
   * @run testng DefaultImage
   */
  
  import java.io.ByteArrayOutputStream;
  import java.io.PrintStream;
  import java.lang.module.ModuleDescriptor;
  import java.lang.module.ModuleFinder;
  import java.lang.module.ModuleReference;
  import java.nio.file.Files;
  import java.nio.file.Path;
  import java.nio.file.Paths;
  import java.util.function.Consumer;
  import java.util.stream.Stream;
+ import jdk.test.lib.compiler.CompilerUtils;
  
  import org.testng.annotations.BeforeTest;
  import org.testng.annotations.Test;
  
  import static java.nio.charset.StandardCharsets.UTF_8;