8067013: Rename the com.oracle.java.testlibary package

Reviewed-by: dholmes, gtriantafill, sla
This commit is contained in:
Alexander Kulyakthin 2015-05-04 16:30:07 +02:00 committed by Katja Kantserova
parent 4c99a3031d
commit 462f735dac
425 changed files with 913 additions and 908 deletions
hotspot/test/compiler
arguments
arraycopy
c2
codecache
codegen
cpuflags
debug
dependencies/MonomorphicObjectCall
eliminateAutobox
intrinsics
jsr292
oracle
profiling
spectrapredefineclass
spectrapredefineclass_classloaders
rangechecks
rtm

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* 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
@ -21,7 +21,7 @@
* questions.
*/
import com.oracle.java.testlibrary.cli.*;
import jdk.test.lib.cli.*;
/**
* Base class for all X86 bit manipulation related command line options.

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* 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
@ -21,8 +21,8 @@
* questions.
*/
import com.oracle.java.testlibrary.*;
import com.oracle.java.testlibrary.cli.*;
import jdk.test.lib.*;
import jdk.test.lib.cli.*;
/**
* Test on bit manipulation related command line options,

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* 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
@ -21,8 +21,8 @@
* questions.
*/
import com.oracle.java.testlibrary.*;
import com.oracle.java.testlibrary.cli.*;
import jdk.test.lib.*;
import jdk.test.lib.cli.*;
/**
* Test on bit manipulation related command line options,

@ -21,7 +21,7 @@
* questions.
*/
import com.oracle.java.testlibrary.*;
import jdk.test.lib.*;
/*
* @test CheckCompileThresholdScaling

@ -38,7 +38,7 @@
*/
import sun.hotspot.cpuinfo.CPUInfo;
import com.oracle.java.testlibrary.*;
import jdk.test.lib.*;
public class TestUseBMI1InstructionsOnSupportedCPU
extends BMISupportedCPUTest {

@ -38,8 +38,8 @@
*/
import sun.hotspot.cpuinfo.CPUInfo;
import com.oracle.java.testlibrary.*;
import com.oracle.java.testlibrary.cli.*;
import jdk.test.lib.*;
import jdk.test.lib.cli.*;
public class TestUseBMI1InstructionsOnUnsupportedCPU
extends BMIUnsupportedCPUTest {

@ -39,7 +39,7 @@
*/
import sun.hotspot.cpuinfo.CPUInfo;
import com.oracle.java.testlibrary.*;
import jdk.test.lib.*;
public class TestUseCountLeadingZerosInstructionOnSupportedCPU
extends BMISupportedCPUTest {

@ -39,7 +39,7 @@
*/
import sun.hotspot.cpuinfo.CPUInfo;
import com.oracle.java.testlibrary.*;
import jdk.test.lib.*;
public class TestUseCountLeadingZerosInstructionOnUnsupportedCPU
extends BMIUnsupportedCPUTest {

@ -39,8 +39,8 @@
*/
import sun.hotspot.cpuinfo.CPUInfo;
import com.oracle.java.testlibrary.*;
import com.oracle.java.testlibrary.cli.*;
import jdk.test.lib.*;
import jdk.test.lib.cli.*;
public class TestUseCountTrailingZerosInstructionOnSupportedCPU
extends BMISupportedCPUTest {

@ -39,8 +39,8 @@
*/
import sun.hotspot.cpuinfo.CPUInfo;
import com.oracle.java.testlibrary.*;
import com.oracle.java.testlibrary.cli.*;
import jdk.test.lib.*;
import jdk.test.lib.cli.*;
public class TestUseCountTrailingZerosInstructionOnUnsupportedCPU
extends BMIUnsupportedCPUTest {

@ -30,7 +30,7 @@
* java.management
* @build TestArrayCopyNoInitDeopt
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* @run main ClassFileInstaller com.oracle.java.testlibrary.Platform
* @run main ClassFileInstaller jdk.test.lib.Platform
* @run main/othervm -Xmixed -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:TypeProfileLevel=020
* TestArrayCopyNoInitDeopt
@ -40,7 +40,7 @@
import sun.hotspot.WhiteBox;
import sun.hotspot.code.NMethod;
import com.oracle.java.testlibrary.Platform;
import jdk.test.lib.Platform;
import java.lang.reflect.*;
public class TestArrayCopyNoInitDeopt {

@ -31,7 +31,7 @@
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
* @build ClassFileInstaller sun.hotspot.WhiteBox com.oracle.java.testlibrary.*
* @build ClassFileInstaller sun.hotspot.WhiteBox jdk.test.lib.*
* Test_ia32 InlinedArrayCloneTestCase
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
@ -44,7 +44,7 @@
import java.lang.reflect.Method;
import com.oracle.java.testlibrary.Asserts;
import jdk.test.lib.Asserts;
import sun.hotspot.WhiteBox;
public class Test_ia32 {

@ -31,7 +31,7 @@
* java.management
*/
import com.oracle.java.testlibrary.*;
import jdk.test.lib.*;
public class Test6857159 {
public static void main(String[] args) throws Exception {

@ -33,8 +33,8 @@
* @run main/othervm -showversion -Xbatch Test7068051
*/
import com.oracle.java.testlibrary.JDKToolLauncher;
import com.oracle.java.testlibrary.OutputAnalyzer;
import jdk.test.lib.JDKToolLauncher;
import jdk.test.lib.OutputAnalyzer;
import java.io.IOException;
import java.io.InputStream;

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 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
@ -26,7 +26,7 @@
* Micro-benchmark for Math.pow() and Math.exp()
*/
import com.oracle.java.testlibrary.Utils;
import jdk.test.lib.Utils;
import java.util.Random;
public class Test7177917 {

@ -19,7 +19,7 @@
* @run main/timeout=300 PolynomialRoot
*/
import com.oracle.java.testlibrary.Utils;
import jdk.test.lib.Utils;
import java.util.Arrays;
import java.util.Random;

@ -31,7 +31,7 @@
* @modules java.base/sun.misc
* java.management
*/
import com.oracle.java.testlibrary.*;
import jdk.test.lib.*;
public class CheckReservedInitialCodeCacheSizeArgOrder {
public static void main(String[] args) throws Exception {

@ -21,7 +21,7 @@
* questions.
*/
import com.oracle.java.testlibrary.*;
import jdk.test.lib.*;
import sun.hotspot.WhiteBox;
/*

@ -30,7 +30,7 @@
* @modules java.base/sun.misc
* java.management
*/
import com.oracle.java.testlibrary.*;
import jdk.test.lib.*;
public class CheckUpperLimit {
public static void main(String[] args) throws Exception {

@ -29,7 +29,7 @@ import java.util.ArrayList;
import sun.hotspot.WhiteBox;
import sun.hotspot.code.BlobType;
import sun.hotspot.code.CodeBlob;
import com.oracle.java.testlibrary.Asserts;
import jdk.test.lib.Asserts;
/*
* @test OverflowCodeCacheTest

@ -20,9 +20,9 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
import com.oracle.java.testlibrary.ExitCode;
import com.oracle.java.testlibrary.Platform;
import com.oracle.java.testlibrary.cli.CommandLineOptionTest;
import jdk.test.lib.ExitCode;
import jdk.test.lib.Platform;
import jdk.test.lib.cli.CommandLineOptionTest;
import common.CodeCacheOptions;
import sun.hotspot.code.BlobType;
@ -35,7 +35,7 @@ import sun.hotspot.code.BlobType;
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
* @build TestSegmentedCodeCacheOption com.oracle.java.testlibrary.*
* @build TestSegmentedCodeCacheOption jdk.test.lib.*
* @run main TestSegmentedCodeCacheOption
*/
public class TestSegmentedCodeCacheOption {

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* 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
@ -22,9 +22,9 @@
*/
package codeheapsize;
import com.oracle.java.testlibrary.ExitCode;
import com.oracle.java.testlibrary.Platform;
import com.oracle.java.testlibrary.cli.CommandLineOptionTest;
import jdk.test.lib.ExitCode;
import jdk.test.lib.Platform;
import jdk.test.lib.cli.CommandLineOptionTest;
import common.CodeCacheCLITestCase;
import common.CodeCacheOptions;
import sun.hotspot.code.BlobType;

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* 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
@ -22,7 +22,7 @@
*/
package codeheapsize;
import com.oracle.java.testlibrary.cli.CommandLineOptionTest;
import jdk.test.lib.cli.CommandLineOptionTest;
import common.CodeCacheCLITestCase;
import common.CodeCacheOptions;
import sun.hotspot.code.BlobType;

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* 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
@ -24,9 +24,9 @@ package codeheapsize;
import common.CodeCacheCLITestCase;
import common.CodeCacheOptions;
import com.oracle.java.testlibrary.ExitCode;
import com.oracle.java.testlibrary.Utils;
import com.oracle.java.testlibrary.cli.CommandLineOptionTest;
import jdk.test.lib.ExitCode;
import jdk.test.lib.Utils;
import jdk.test.lib.cli.CommandLineOptionTest;
import sun.hotspot.code.BlobType;
import java.util.Random;

@ -22,7 +22,7 @@
*/
package codeheapsize;
import com.oracle.java.testlibrary.Platform;
import jdk.test.lib.Platform;
import common.CodeCacheCLITestBase;
import common.CodeCacheCLITestCase;
import sun.hotspot.code.BlobType;
@ -36,7 +36,7 @@ import java.util.EnumSet;
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
* @build TestCodeHeapSizeOptions com.oracle.java.testlibrary.* codeheapsize.*
* @build TestCodeHeapSizeOptions jdk.test.lib.* codeheapsize.*
* common.*
* @run main/timeout=240 codeheapsize.TestCodeHeapSizeOptions
*/

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* 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
@ -22,8 +22,8 @@
*/
package common;
import com.oracle.java.testlibrary.Platform;
import com.oracle.java.testlibrary.cli.CommandLineOptionTest;
import jdk.test.lib.Platform;
import jdk.test.lib.cli.CommandLineOptionTest;
import sun.hotspot.code.BlobType;
import java.util.Collections;

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* 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
@ -22,7 +22,7 @@
*/
package common;
import com.oracle.java.testlibrary.cli.CommandLineOptionTest;
import jdk.test.lib.cli.CommandLineOptionTest;
import sun.hotspot.code.BlobType;
import java.util.ArrayList;

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* 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
@ -22,8 +22,8 @@
*/
package printcodecache;
import com.oracle.java.testlibrary.ExitCode;
import com.oracle.java.testlibrary.cli.CommandLineOptionTest;
import jdk.test.lib.ExitCode;
import jdk.test.lib.cli.CommandLineOptionTest;
import common.CodeCacheCLITestCase;
import common.CodeCacheInfoFormatter;
import common.CodeCacheOptions;

@ -35,7 +35,7 @@ import java.util.EnumSet;
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
* @build TestPrintCodeCacheOption com.oracle.java.testlibrary.*
* @build TestPrintCodeCacheOption jdk.test.lib.*
* printcodecache.* common.*
* @run main/timeout=240 printcodecache.TestPrintCodeCacheOption
*/

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* 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
@ -21,12 +21,12 @@
* questions.
*/
import com.oracle.java.testlibrary.Asserts;
import com.oracle.java.testlibrary.JDKToolFinder;
import com.oracle.java.testlibrary.OutputAnalyzer;
import com.oracle.java.testlibrary.Utils;
import com.oracle.java.testlibrary.dtrace.DtraceResultsAnalyzer;
import com.oracle.java.testlibrary.dtrace.DtraceRunner;
import jdk.test.lib.Asserts;
import jdk.test.lib.JDKToolFinder;
import jdk.test.lib.OutputAnalyzer;
import jdk.test.lib.Utils;
import jdk.test.lib.dtrace.DtraceResultsAnalyzer;
import jdk.test.lib.dtrace.DtraceRunner;
import java.io.IOException;
import java.lang.reflect.Executable;
import java.nio.file.Files;
@ -115,7 +115,7 @@ public class SegmentedCodeCacheDtraceTest {
public static void main(String args[]) {
int iterations
= Integer.getInteger("com.oracle.java.testlibrary.iterations", 1);
= Integer.getInteger("jdk.test.lib.iterations", 1);
if (!DtraceRunner.dtraceAvailable()) {
System.out.println("INFO: There is no dtrace avaiable. Skipping.");
return;

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* 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
@ -21,7 +21,7 @@
* questions.
*/
import com.oracle.java.testlibrary.Utils;
import jdk.test.lib.Utils;
import java.lang.reflect.Executable;
import java.util.ArrayList;
import java.util.Arrays;

@ -21,7 +21,7 @@
* questions.
*/
import com.oracle.java.testlibrary.Asserts;
import jdk.test.lib.Asserts;
import java.lang.management.MemoryType;
import sun.hotspot.code.BlobType;

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* 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
@ -21,7 +21,7 @@
* questions.
*/
import com.oracle.java.testlibrary.Utils;
import jdk.test.lib.Utils;
import java.lang.management.MemoryPoolMXBean;
import javax.management.Notification;
import sun.hotspot.WhiteBox;

@ -21,7 +21,7 @@
* questions.
*/
import com.oracle.java.testlibrary.Asserts;
import jdk.test.lib.Asserts;
import java.util.EnumSet;
import sun.hotspot.code.BlobType;

@ -21,7 +21,7 @@
* questions.
*/
import com.oracle.java.testlibrary.Asserts;
import jdk.test.lib.Asserts;
import java.lang.management.MemoryPoolMXBean;
import java.util.HashMap;
import java.util.Map;

@ -21,7 +21,7 @@
* questions.
*/
import com.oracle.java.testlibrary.Asserts;
import jdk.test.lib.Asserts;
import java.lang.management.MemoryPoolMXBean;
import java.util.ArrayList;
import java.util.List;

@ -21,7 +21,7 @@
* questions.
*/
import com.oracle.java.testlibrary.Asserts;
import jdk.test.lib.Asserts;
import java.lang.management.MemoryPoolMXBean;
import sun.hotspot.code.BlobType;

@ -21,7 +21,7 @@
* questions.
*/
import com.oracle.java.testlibrary.Asserts;
import jdk.test.lib.Asserts;
import java.lang.management.ManagementFactory;
import java.lang.management.MemoryManagerMXBean;
import java.util.HashMap;

@ -21,7 +21,7 @@
* questions.
*/
import com.oracle.java.testlibrary.Asserts;
import jdk.test.lib.Asserts;
import java.lang.management.MemoryPoolMXBean;
import sun.hotspot.code.BlobType;

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* 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
@ -21,8 +21,8 @@
* questions.
*/
import com.oracle.java.testlibrary.Asserts;
import com.oracle.java.testlibrary.Utils;
import jdk.test.lib.Asserts;
import jdk.test.lib.Utils;
import java.lang.management.ManagementFactory;
import java.lang.management.MemoryNotificationInfo;
import java.lang.management.MemoryPoolMXBean;

@ -21,8 +21,8 @@
* questions.
*/
import com.oracle.java.testlibrary.Asserts;
import com.oracle.java.testlibrary.Utils;
import jdk.test.lib.Asserts;
import jdk.test.lib.Utils;
import java.lang.management.ManagementFactory;
import java.lang.management.MemoryNotificationInfo;
import java.lang.management.MemoryPoolMXBean;
@ -83,7 +83,7 @@ public class ThresholdNotificationsTest implements NotificationListener {
protected void runTest() {
int iterationsCount =
Integer.getInteger("com.oracle.java.testlibrary.iterations", 1);
Integer.getInteger("jdk.test.lib.iterations", 1);
MemoryPoolMXBean bean = btype.getMemoryPool();
((NotificationEmitter) ManagementFactory.getMemoryMXBean()).
addNotificationListener(this, null, null);

@ -32,7 +32,7 @@
* @run main/othervm -Xbootclasspath/a:. -XX:-UseCodeCacheFlushing
* -XX:-MethodFlushing -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+SegmentedCodeCache -XX:CompileCommand=compileonly,null::*
* -Dcom.oracle.java.testlibrary.iterations=10 UsageThresholdExceededTest
* -Djdk.test.lib.iterations=10 UsageThresholdExceededTest
* @summary verifying that getUsageThresholdCount() returns correct value
* after threshold has been hit several times
*/

@ -21,7 +21,7 @@
* questions.
*/
import com.oracle.java.testlibrary.Asserts;
import jdk.test.lib.Asserts;
import java.lang.management.MemoryPoolMXBean;
import sun.hotspot.code.BlobType;
@ -52,7 +52,7 @@ public class UsageThresholdExceededTest {
public static void main(String[] args) {
int iterationsCount =
Integer.getInteger("com.oracle.java.testlibrary.iterations", 1);
Integer.getInteger("jdk.test.lib.iterations", 1);
for (BlobType btype : BlobType.getAvailable()) {
if (CodeCacheUtils.isCodeHeapPredictable(btype)) {
new UsageThresholdExceededTest(btype, iterationsCount)

@ -21,7 +21,7 @@
* questions.
*/
import com.oracle.java.testlibrary.Asserts;
import jdk.test.lib.Asserts;
import java.lang.management.MemoryPoolMXBean;
import sun.hotspot.code.BlobType;

@ -21,7 +21,7 @@
* questions.
*/
import com.oracle.java.testlibrary.Asserts;
import jdk.test.lib.Asserts;
import java.lang.management.MemoryPoolMXBean;
import sun.hotspot.code.BlobType;

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* 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
@ -22,8 +22,8 @@
*
*/
import com.oracle.java.testlibrary.TimeLimitedRunner;
import com.oracle.java.testlibrary.Utils;
import jdk.test.lib.TimeLimitedRunner;
import jdk.test.lib.Utils;
public class CodeCacheStressRunner {
private final Runnable action;

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* 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
@ -28,10 +28,10 @@ import java.io.IOException;
import java.util.concurrent.Callable;
import java.util.Random;
import com.oracle.java.testlibrary.Asserts;
import com.oracle.java.testlibrary.ByteCodeLoader;
import com.oracle.java.testlibrary.InfiniteLoop;
import com.oracle.java.testlibrary.Utils;
import jdk.test.lib.Asserts;
import jdk.test.lib.ByteCodeLoader;
import jdk.test.lib.InfiniteLoop;
import jdk.test.lib.Utils;
import sun.hotspot.WhiteBox;
public final class Helper {

@ -25,7 +25,7 @@
import java.lang.reflect.Method;
import java.util.stream.IntStream;
import com.oracle.java.testlibrary.Platform;
import jdk.test.lib.Platform;
/*
* @test OverloadCompileQueueTest

@ -33,7 +33,7 @@
*
*/
import com.oracle.java.testlibrary.Utils;
import jdk.test.lib.Utils;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
import java.nio.charset.Charset;

@ -32,7 +32,7 @@
* @run main/timeout=300 Test7100757
*/
import com.oracle.java.testlibrary.Utils;
import jdk.test.lib.Utils;
import java.util.BitSet;
import java.util.Random;

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 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
@ -26,7 +26,7 @@
* @author Tom Deneau
*/
import com.oracle.java.testlibrary.Utils;
import jdk.test.lib.Utils;
import java.security.AlgorithmParameters;
import java.util.Random;
import javax.crypto.Cipher;

@ -29,7 +29,7 @@
* @modules java.base/sun.misc
* java.management
*/
import com.oracle.java.testlibrary.*;
import jdk.test.lib.*;
public class RestoreMXCSR {
public static void main(String[] args) throws Exception {

@ -29,7 +29,7 @@
* @modules java.base/sun.misc
* java.management
*/
import com.oracle.java.testlibrary.*;
import jdk.test.lib.*;
public class VerifyAdapterSharing {
public static void main(String[] args) throws Exception {

@ -25,7 +25,7 @@ import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import com.oracle.java.testlibrary.*;
import jdk.test.lib.*;
/*
* @test

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* 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
@ -30,7 +30,7 @@
* -XX:CompileOnly=::valueOf,::byteValue,::shortValue,::testUnsignedByte,::testUnsignedShort
* UnsignedLoads
*/
import static com.oracle.java.testlibrary.Asserts.assertEQ;
import static jdk.test.lib.Asserts.assertEQ;
public class UnsignedLoads {
public static int testUnsignedByte() {

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* 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
@ -22,10 +22,10 @@
*
*/
import com.oracle.java.testlibrary.Asserts;
import com.oracle.java.testlibrary.OutputAnalyzer;
import com.oracle.java.testlibrary.ProcessTools;
import com.oracle.java.testlibrary.Utils;
import jdk.test.lib.Asserts;
import jdk.test.lib.OutputAnalyzer;
import jdk.test.lib.ProcessTools;
import jdk.test.lib.Utils;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* 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
@ -22,9 +22,9 @@
*
*/
import com.oracle.java.testlibrary.Asserts;
import com.oracle.java.testlibrary.Platform;
import com.oracle.java.testlibrary.Utils;
import jdk.test.lib.Asserts;
import jdk.test.lib.Platform;
import jdk.test.lib.Utils;
import sun.hotspot.code.NMethod;
import sun.hotspot.cpuinfo.CPUInfo;

@ -25,13 +25,14 @@
* @test NullCheckDroppingsTest
* @bug 8054492
* @summary "Casting can result in redundant null checks in generated code"
* @library /testlibrary /../../test/lib /testlibrary/com/oracle/java/testlibrary
* @library /testlibrary /../../test/lib
* @modules java.base/sun.misc
* java.management
* @build ClassFileInstaller sun.hotspot.WhiteBox jdk.test.lib.*
* @build NullCheckDroppingsTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main ClassFileInstaller com.oracle.java.testlibrary.Platform
* @run main ClassFileInstaller jdk.test.lib.Platform
* @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -Xmixed -XX:-BackgroundCompilation -XX:-TieredCompilation -XX:CompileThreshold=1000
* -XX:CompileCommand=exclude,NullCheckDroppingsTest::runTest NullCheckDroppingsTest
@ -39,7 +40,7 @@
import sun.hotspot.WhiteBox;
import sun.hotspot.code.NMethod;
import com.oracle.java.testlibrary.Platform;
import jdk.test.lib.Platform;
import java.lang.reflect.Method;
import java.lang.invoke.MethodHandle;

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* 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
@ -29,7 +29,7 @@
* @library /testlibrary
* @run main/othervm -XX:-TieredCompilation -Xbatch -XX:CompileOnly=TestObjectClone::f TestObjectClone
*/
import com.oracle.java.testlibrary.Asserts;
import jdk.test.lib.Asserts;
public class TestObjectClone implements Cloneable {
static class A extends TestObjectClone {}

@ -33,7 +33,7 @@
*
*/
import com.oracle.java.testlibrary.Utils;
import jdk.test.lib.Utils;
import java.util.Random;
public class AddExactIRepeatTest {

@ -33,7 +33,7 @@
*
*/
import com.oracle.java.testlibrary.Utils;
import jdk.test.lib.Utils;
import java.util.Random;
public class MulExactIRepeatTest {

@ -33,7 +33,7 @@
*
*/
import com.oracle.java.testlibrary.Utils;
import jdk.test.lib.Utils;
import java.util.Random;
public class SubExactIRepeatTest {

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 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
@ -21,7 +21,7 @@
* questions.
*/
import com.oracle.java.testlibrary.Utils;
import jdk.test.lib.Utils;
import java.util.Random;
/**

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 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
@ -21,7 +21,7 @@
* questions.
*/
import com.oracle.java.testlibrary.Platform;
import jdk.test.lib.Platform;
import intrinsics.Verifier;
import java.io.FileOutputStream;

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* 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
@ -21,8 +21,8 @@
* questions.
*/
import com.oracle.java.testlibrary.Platform;
import com.oracle.java.testlibrary.cli.CommandLineOptionTest;
import jdk.test.lib.Platform;
import jdk.test.lib.cli.CommandLineOptionTest;
import sha.predicate.IntrinsicPredicates;
import java.util.function.BooleanSupplier;

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* 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
@ -21,11 +21,11 @@
* questions.
*/
import com.oracle.java.testlibrary.ExitCode;
import com.oracle.java.testlibrary.Platform;
import com.oracle.java.testlibrary.cli.CommandLineOptionTest;
import com.oracle.java.testlibrary.cli.predicate.NotPredicate;
import com.oracle.java.testlibrary.cli.predicate.OrPredicate;
import jdk.test.lib.ExitCode;
import jdk.test.lib.Platform;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.NotPredicate;
import jdk.test.lib.cli.predicate.OrPredicate;
/**
* Generic test case for SHA-related options targeted to non-x86 and

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* 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
@ -21,10 +21,10 @@
* questions.
*/
import com.oracle.java.testlibrary.ExitCode;
import com.oracle.java.testlibrary.Platform;
import com.oracle.java.testlibrary.cli.CommandLineOptionTest;
import com.oracle.java.testlibrary.cli.predicate.AndPredicate;
import jdk.test.lib.ExitCode;
import jdk.test.lib.Platform;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
/**
* Generic test case for SHA-related options targeted to SPARC CPUs which

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* 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
@ -21,11 +21,11 @@
* questions.
*/
import com.oracle.java.testlibrary.ExitCode;
import com.oracle.java.testlibrary.Platform;
import com.oracle.java.testlibrary.cli.CommandLineOptionTest;
import com.oracle.java.testlibrary.cli.predicate.AndPredicate;
import com.oracle.java.testlibrary.cli.predicate.NotPredicate;
import jdk.test.lib.ExitCode;
import jdk.test.lib.Platform;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
import jdk.test.lib.cli.predicate.NotPredicate;
/**
* Generic test case for SHA-related options targeted to SPARC CPUs which don't

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* 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
@ -21,10 +21,10 @@
* questions.
*/
import com.oracle.java.testlibrary.ExitCode;
import com.oracle.java.testlibrary.Platform;
import com.oracle.java.testlibrary.cli.CommandLineOptionTest;
import com.oracle.java.testlibrary.cli.predicate.OrPredicate;
import jdk.test.lib.ExitCode;
import jdk.test.lib.Platform;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.OrPredicate;
/**
* Generic test case for SHA-related options targeted to X86 CPUs that don't

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* 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
@ -21,11 +21,11 @@
* questions.
*/
import com.oracle.java.testlibrary.ExitCode;
import com.oracle.java.testlibrary.Platform;
import com.oracle.java.testlibrary.cli.CommandLineOptionTest;
import com.oracle.java.testlibrary.cli.predicate.AndPredicate;
import com.oracle.java.testlibrary.cli.predicate.NotPredicate;
import jdk.test.lib.ExitCode;
import jdk.test.lib.Platform;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
import jdk.test.lib.cli.predicate.NotPredicate;
import sha.predicate.IntrinsicPredicates;
/**

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* 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
@ -21,11 +21,11 @@
* questions.
*/
import com.oracle.java.testlibrary.Asserts;
import com.oracle.java.testlibrary.ExitCode;
import com.oracle.java.testlibrary.Platform;
import com.oracle.java.testlibrary.cli.CommandLineOptionTest;
import com.oracle.java.testlibrary.cli.predicate.AndPredicate;
import jdk.test.lib.Asserts;
import jdk.test.lib.ExitCode;
import jdk.test.lib.Platform;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
import sha.predicate.IntrinsicPredicates;
/**

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* 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
@ -21,12 +21,12 @@
* questions.
*/
import com.oracle.java.testlibrary.Asserts;
import com.oracle.java.testlibrary.ExitCode;
import com.oracle.java.testlibrary.Platform;
import com.oracle.java.testlibrary.cli.CommandLineOptionTest;
import com.oracle.java.testlibrary.cli.predicate.AndPredicate;
import com.oracle.java.testlibrary.cli.predicate.NotPredicate;
import jdk.test.lib.Asserts;
import jdk.test.lib.ExitCode;
import jdk.test.lib.Platform;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
import jdk.test.lib.cli.predicate.NotPredicate;
import sha.predicate.IntrinsicPredicates;
/**

@ -1,5 +1,5 @@
//
// Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
// Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
// Copyright (c) 2015, Red Hat Inc. All rights reserved.
// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
//
@ -23,7 +23,7 @@
//
//
import com.oracle.java.testlibrary.Utils;
import jdk.test.lib.Utils;
import static java.lang.Math.abs;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;

@ -30,7 +30,7 @@
* java.management
* @run main/othervm ConcurrentClassLoadingTest
*/
import com.oracle.java.testlibrary.Utils;
import jdk.test.lib.Utils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

@ -29,8 +29,8 @@
* @run main/othervm MHInlineTest
*/
import java.lang.invoke.*;
import com.oracle.java.testlibrary.*;
import static com.oracle.java.testlibrary.Asserts.*;
import jdk.test.lib.*;
import static jdk.test.lib.Asserts.*;
public class MHInlineTest {
public static void main(String[] args) throws Exception {

@ -24,7 +24,7 @@
import java.io.PrintWriter;
import java.io.File;
import com.oracle.java.testlibrary.*;
import jdk.test.lib.*;
/*
* @test CheckCompileCommandOption

@ -24,14 +24,14 @@
import java.lang.reflect.Executable;
import java.util.function.BiFunction;
import com.oracle.java.testlibrary.Asserts;
import jdk.test.lib.Asserts;
import sun.hotspot.WhiteBox;
/*
* @test
* @bug 8074980
* @library /testlibrary /../../test/lib
* @build sun.hotspot.WhiteBox com.oracle.java.testlibrary.Asserts GetMethodOptionTest
* @build sun.hotspot.WhiteBox jdk.test.lib.Asserts GetMethodOptionTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI

@ -24,7 +24,7 @@
import java.io.PrintWriter;
import java.io.File;
import com.oracle.java.testlibrary.*;
import jdk.test.lib.*;
/*
* @test TestCompileCommand

@ -21,7 +21,7 @@
* questions.
*/
import java.io.PrintWriter;
import com.oracle.java.testlibrary.*;
import jdk.test.lib.*;
/*
* @test

@ -21,7 +21,7 @@
* questions.
*/
import java.io.PrintWriter;
import com.oracle.java.testlibrary.*;
import jdk.test.lib.*;
/*
* @test

@ -28,7 +28,7 @@
* @library /testlibrary /../../test/lib /compiler/whitebox
* @build TestExplicitRangeChecks
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* @run main ClassFileInstaller com.oracle.java.testlibrary.Platform
* @run main ClassFileInstaller jdk.test.lib.Platform
* @run main/othervm -ea -Xmixed -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:CompileCommand=compileonly,TestExplicitRangeChecks.test* TestExplicitRangeChecks
*
@ -39,7 +39,7 @@ import java.lang.reflect.*;
import java.util.*;
import sun.hotspot.WhiteBox;
import sun.hotspot.code.NMethod;
import com.oracle.java.testlibrary.Platform;
import jdk.test.lib.Platform;
import sun.misc.Unsafe;
public class TestExplicitRangeChecks {

@ -30,7 +30,7 @@
* java.management
* @build TestRangeCheckSmearing
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* @run main ClassFileInstaller com.oracle.java.testlibrary.Platform
* @run main ClassFileInstaller jdk.test.lib.Platform
* @run main/othervm -ea -Xmixed -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:-BackgroundCompilation -XX:-UseOnStackReplacement TestRangeCheckSmearing
*
@ -41,7 +41,7 @@ import java.lang.reflect.*;
import java.util.*;
import sun.hotspot.WhiteBox;
import sun.hotspot.code.NMethod;
import com.oracle.java.testlibrary.Platform;
import jdk.test.lib.Platform;
public class TestRangeCheckSmearing {
private static final WhiteBox WHITE_BOX = WhiteBox.getWhiteBox();

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* 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
@ -22,8 +22,8 @@
*
*/
import com.oracle.java.testlibrary.*;
import com.oracle.java.testlibrary.cli.*;
import jdk.test.lib.*;
import jdk.test.lib.cli.*;
import java.util.function.BooleanSupplier;

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* 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
@ -25,9 +25,9 @@
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 jdk.test.lib.ExitCode;
import jdk.test.lib.cli.*;
import jdk.test.lib.cli.predicate.AndPredicate;
import rtm.predicate.SupportedCPU;
import rtm.predicate.SupportedVM;

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* 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
@ -22,8 +22,8 @@
*
*/
import com.oracle.java.testlibrary.*;
import com.oracle.java.testlibrary.cli.*;
import jdk.test.lib.*;
import jdk.test.lib.cli.*;
import java.util.function.BooleanSupplier;

@ -38,8 +38,8 @@
* TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig
*/
import com.oracle.java.testlibrary.cli.*;
import com.oracle.java.testlibrary.cli.predicate.AndPredicate;
import jdk.test.lib.cli.*;
import jdk.test.lib.cli.predicate.AndPredicate;
import rtm.predicate.SupportedCPU;
import rtm.predicate.SupportedVM;

@ -38,8 +38,8 @@
* TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig
*/
import com.oracle.java.testlibrary.cli.predicate.AndPredicate;
import com.oracle.java.testlibrary.cli.predicate.NotPredicate;
import jdk.test.lib.cli.predicate.AndPredicate;
import jdk.test.lib.cli.predicate.NotPredicate;
import rtm.predicate.SupportedCPU;
import rtm.predicate.SupportedVM;

@ -37,8 +37,8 @@
* -XX:+WhiteBoxAPI TestRTMAbortRatioOptionOnUnsupportedConfig
*/
import com.oracle.java.testlibrary.cli.predicate.AndPredicate;
import com.oracle.java.testlibrary.cli.predicate.NotPredicate;
import jdk.test.lib.cli.predicate.AndPredicate;
import jdk.test.lib.cli.predicate.NotPredicate;
import rtm.predicate.SupportedCPU;
import rtm.predicate.SupportedVM;

@ -22,8 +22,8 @@
*
*/
import com.oracle.java.testlibrary.cli.predicate.AndPredicate;
import com.oracle.java.testlibrary.cli.predicate.NotPredicate;
import jdk.test.lib.cli.predicate.AndPredicate;
import jdk.test.lib.cli.predicate.NotPredicate;
import rtm.predicate.SupportedCPU;
import rtm.predicate.SupportedVM;

@ -37,9 +37,9 @@
* -XX:+WhiteBoxAPI TestUseRTMDeoptOptionOnSupportedConfig
*/
import com.oracle.java.testlibrary.ExitCode;
import com.oracle.java.testlibrary.cli.CommandLineOptionTest;
import com.oracle.java.testlibrary.cli.predicate.AndPredicate;
import jdk.test.lib.ExitCode;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
import rtm.predicate.SupportedCPU;
import rtm.predicate.SupportedVM;

@ -37,10 +37,10 @@
* -XX:+WhiteBoxAPI TestUseRTMDeoptOptionOnUnsupportedConfig
*/
import com.oracle.java.testlibrary.cli.CommandLineOptionTest;
import jdk.test.lib.cli.CommandLineOptionTest;
import com.oracle.java.testlibrary.cli.predicate.AndPredicate;
import com.oracle.java.testlibrary.cli.predicate.NotPredicate;
import jdk.test.lib.cli.predicate.AndPredicate;
import jdk.test.lib.cli.predicate.NotPredicate;
import rtm.predicate.SupportedCPU;
import rtm.predicate.SupportedVM;

@ -38,9 +38,9 @@
* TestUseRTMForStackLocksOptionOnSupportedConfig
*/
import com.oracle.java.testlibrary.*;
import com.oracle.java.testlibrary.cli.*;
import com.oracle.java.testlibrary.cli.predicate.AndPredicate;
import jdk.test.lib.*;
import jdk.test.lib.cli.*;
import jdk.test.lib.cli.predicate.AndPredicate;
import rtm.predicate.SupportedCPU;
import rtm.predicate.SupportedVM;

@ -38,10 +38,10 @@
* TestUseRTMForStackLocksOptionOnUnsupportedConfig
*/
import com.oracle.java.testlibrary.ExitCode;
import com.oracle.java.testlibrary.cli.CommandLineOptionTest;
import com.oracle.java.testlibrary.cli.predicate.AndPredicate;
import com.oracle.java.testlibrary.cli.predicate.NotPredicate;
import jdk.test.lib.ExitCode;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
import jdk.test.lib.cli.predicate.NotPredicate;
import rtm.predicate.SupportedCPU;
import rtm.predicate.SupportedVM;

@ -37,9 +37,9 @@
* -XX:+WhiteBoxAPI TestUseRTMLockingOptionOnSupportedConfig
*/
import com.oracle.java.testlibrary.ExitCode;
import com.oracle.java.testlibrary.cli.*;
import com.oracle.java.testlibrary.cli.predicate.AndPredicate;
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;

@ -37,10 +37,10 @@
* -XX:+WhiteBoxAPI TestUseRTMLockingOptionOnUnsupportedCPU
*/
import com.oracle.java.testlibrary.*;
import com.oracle.java.testlibrary.cli.*;
import com.oracle.java.testlibrary.cli.predicate.AndPredicate;
import com.oracle.java.testlibrary.cli.predicate.NotPredicate;
import jdk.test.lib.*;
import jdk.test.lib.cli.*;
import jdk.test.lib.cli.predicate.AndPredicate;
import jdk.test.lib.cli.predicate.NotPredicate;
import rtm.predicate.SupportedCPU;
import rtm.predicate.SupportedVM;

@ -37,10 +37,10 @@
* -XX:+WhiteBoxAPI TestUseRTMLockingOptionOnUnsupportedVM
*/
import com.oracle.java.testlibrary.ExitCode;
import com.oracle.java.testlibrary.cli.*;
import com.oracle.java.testlibrary.cli.predicate.AndPredicate;
import com.oracle.java.testlibrary.cli.predicate.NotPredicate;
import jdk.test.lib.ExitCode;
import jdk.test.lib.cli.*;
import jdk.test.lib.cli.predicate.AndPredicate;
import jdk.test.lib.cli.predicate.NotPredicate;
import rtm.predicate.SupportedCPU;
import rtm.predicate.SupportedVM;

@ -37,9 +37,9 @@
* -XX:+WhiteBoxAPI TestUseRTMLockingOptionWithBiasedLocking
*/
import com.oracle.java.testlibrary.*;
import com.oracle.java.testlibrary.cli.*;
import com.oracle.java.testlibrary.cli.predicate.AndPredicate;
import jdk.test.lib.*;
import jdk.test.lib.cli.*;
import jdk.test.lib.cli.predicate.AndPredicate;
import rtm.predicate.SupportedCPU;
import rtm.predicate.SupportedVM;

@ -38,9 +38,9 @@
*/
import java.util.List;
import com.oracle.java.testlibrary.*;
import com.oracle.java.testlibrary.cli.CommandLineOptionTest;
import com.oracle.java.testlibrary.cli.predicate.AndPredicate;
import jdk.test.lib.*;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
import rtm.*;
import rtm.predicate.SupportedCPU;
import rtm.predicate.SupportedVM;

@ -38,9 +38,9 @@
*/
import java.util.List;
import com.oracle.java.testlibrary.*;
import com.oracle.java.testlibrary.cli.CommandLineOptionTest;
import com.oracle.java.testlibrary.cli.predicate.AndPredicate;
import jdk.test.lib.*;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
import rtm.*;
import rtm.predicate.SupportedCPU;
import rtm.predicate.SupportedVM;

@ -40,9 +40,9 @@
*/
import java.util.List;
import com.oracle.java.testlibrary.*;
import com.oracle.java.testlibrary.cli.CommandLineOptionTest;
import com.oracle.java.testlibrary.cli.predicate.AndPredicate;
import jdk.test.lib.*;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
import rtm.*;
import rtm.predicate.SupportedCPU;
import rtm.predicate.SupportedVM;

Some files were not shown because too many files have changed in this diff Show More