test/java/lang/invoke/MethodHandles/CatchExceptionTest.java

rev 17241 : 8180890: move c.o.testlibrary.jsr292 classes to jdk/test/java/lang/invoke directory
Reviewed-by: duke

*** 1,7 ****
  /*
!  * Copyright (c) 2014, 2015, 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) 2014, 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.
*** 18,31 ****
   *
   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package test.java.lang.invoke.MethodHandles;
  
! import com.oracle.testlibrary.jsr292.Helper;
! import com.oracle.testlibrary.jsr292.CodeCacheOverflowProcessor;
  import jdk.testlibrary.Asserts;
  import jdk.testlibrary.TimeLimitedRunner;
  import jdk.testlibrary.Utils;
  
  import java.lang.invoke.MethodHandle;
--- 18,32 ----
   *
   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
+ 
  package test.java.lang.invoke.MethodHandles;
  
! import test.java.lang.invoke.lib.Helper;
! import test.java.lang.invoke.lib.CodeCacheOverflowProcessor;
  import jdk.testlibrary.Asserts;
  import jdk.testlibrary.TimeLimitedRunner;
  import jdk.testlibrary.Utils;
  
  import java.lang.invoke.MethodHandle;
*** 36,46 ****
  import java.util.function.BiFunction;
  import java.util.function.Function;
  import java.util.function.Supplier;
  
  /* @test
!  * @library /lib/testlibrary/jsr292 /lib/testlibrary/
   * @compile CatchExceptionTest.java
   * @run main/othervm -esa test.java.lang.invoke.MethodHandles.CatchExceptionTest
   * @key intermittent randomness
   */
  public class CatchExceptionTest {
--- 37,47 ----
  import java.util.function.BiFunction;
  import java.util.function.Function;
  import java.util.function.Supplier;
  
  /* @test
!  * @library /java/lang/invoke/common /lib/testlibrary/
   * @compile CatchExceptionTest.java
   * @run main/othervm -esa test.java.lang.invoke.MethodHandles.CatchExceptionTest
   * @key intermittent randomness
   */
  public class CatchExceptionTest {