test/compiler/rtm/cli/RTMLockingAwareTest.java

*** 1,7 ****
  /*
!  * Copyright (c) 2014, 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, 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.
*** 23,35 ****
   */
  
  import java.util.List;
  import java.util.LinkedList;
  
! import com.oracle.java.testlibrary.ExitCode;
! import com.oracle.java.testlibrary.cli.*;
! import com.oracle.java.testlibrary.cli.predicate.AndPredicate;
  import rtm.predicate.SupportedCPU;
  import rtm.predicate.SupportedVM;
  
  /**
   * Base for all RTM-related CLI tests on options whose processing depends
--- 23,35 ----
   */
  
  import java.util.List;
  import java.util.LinkedList;
  
! import jdk.test.lib.ExitCode;
! import jdk.test.lib.cli.*;
! import jdk.test.lib.cli.predicate.AndPredicate;
  import rtm.predicate.SupportedCPU;
  import rtm.predicate.SupportedVM;
  
  /**
   * Base for all RTM-related CLI tests on options whose processing depends