From 56ee0fccb33a3b542da89ff252d5f4e5aa6d0ddb Mon Sep 17 00:00:00 2001
From: Igor Ignatyev <iignatyev@openjdk.org>
Date: Mon, 27 Aug 2018 17:01:15 -0700
Subject: [PATCH] 8186548: move jdk.testlibrary.JcmdBase closer to tests

Reviewed-by: cjplummer, amenkov
---
 .../jdk/testlibrary => sun/tools/jcmd}/JcmdBase.java      | 8 +++++---
 test/jdk/sun/tools/jcmd/TestJcmdDefaults.java             | 1 -
 test/jdk/sun/tools/jcmd/TestJcmdSanity.java               | 3 +--
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename test/jdk/{lib/testlibrary/jdk/testlibrary => sun/tools/jcmd}/JcmdBase.java (95%)

diff --git a/test/jdk/lib/testlibrary/jdk/testlibrary/JcmdBase.java b/test/jdk/sun/tools/jcmd/JcmdBase.java
similarity index 95%
rename from test/jdk/lib/testlibrary/jdk/testlibrary/JcmdBase.java
rename to test/jdk/sun/tools/jcmd/JcmdBase.java
index ac66cf431a2..e11d2cbb0d6 100644
--- a/test/jdk/lib/testlibrary/jdk/testlibrary/JcmdBase.java
+++ b/test/jdk/sun/tools/jcmd/JcmdBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, 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,12 @@
  * questions.
  */
 
-package jdk.testlibrary;
-
 import java.util.Arrays;
 
+import jdk.testlibrary.OutputAnalyzer;
+import jdk.testlibrary.ProcessTools;
+import jdk.testlibrary.JDKToolLauncher;
+
 /**
  * Helper class for starting jcmd process.
  * <pre>
diff --git a/test/jdk/sun/tools/jcmd/TestJcmdDefaults.java b/test/jdk/sun/tools/jcmd/TestJcmdDefaults.java
index ed6843dda42..c48624d3259 100644
--- a/test/jdk/sun/tools/jcmd/TestJcmdDefaults.java
+++ b/test/jdk/sun/tools/jcmd/TestJcmdDefaults.java
@@ -30,7 +30,6 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
 
-import jdk.testlibrary.JcmdBase;
 import jdk.testlibrary.OutputAnalyzer;
 import jdk.testlibrary.Utils;
 
diff --git a/test/jdk/sun/tools/jcmd/TestJcmdSanity.java b/test/jdk/sun/tools/jcmd/TestJcmdSanity.java
index 9a2140455aa..6fdaddfa7d1 100644
--- a/test/jdk/sun/tools/jcmd/TestJcmdSanity.java
+++ b/test/jdk/sun/tools/jcmd/TestJcmdSanity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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,6 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
 
-import jdk.testlibrary.JcmdBase;
 import jdk.testlibrary.OutputAnalyzer;
 import jdk.testlibrary.ProcessTools;
 import jdk.testlibrary.Utils;