*** old/test/compiler/types/correctness/CorrectnessTest.java	Tue Dec  9 15:13:14 2014
--- new/test/compiler/types/correctness/CorrectnessTest.java	Tue Dec  9 15:13:13 2014

*** 22,38 ****
--- 22,38 ----
   */
  
  /*
   * @test CorrectnessTest
   * @bug 8038418
!  * @library /testlibrary /testlibrary/whitebox
!  * @library /testlibrary /../../test/lib
   * @ignore 8066173
   * @compile execution/TypeConflict.java execution/TypeProfile.java
   *          execution/MethodHandleDelegate.java
   * @build CorrectnessTest
!  * @run main ClassFileInstaller sun.hotspot.WhiteBox
!  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
!  * @run main ClassFileInstaller jdk.testlib.WhiteBox
!  *                              jdk.testlib.WhiteBox$WhiteBoxPermission
   * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockExperimentalVMOptions
   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
   *                   -XX:TypeProfileLevel=222 -XX:+UseTypeSpeculation
   *                   -XX:CompileCommand=exclude,execution/*::methodNotToCompile
   *                   -XX:CompileCommand=dontinline,scenarios/Scenario::collectReturnType

*** 58,68 ****
--- 58,68 ----
  import execution.MethodHandleDelegate;
  import execution.TypeConflict;
  import execution.TypeProfile;
  import hierarchies.*;
  import scenarios.*;
! import sun.hotspot.WhiteBox;
! import jdk.testlib.WhiteBox;
  
  import java.lang.reflect.Constructor;
  import java.lang.reflect.Method;
  import java.util.ArrayList;
  import java.util.List;