diff -r b4441f6cfe79 -r c2304140ed64 hotspot/test/compiler/compilercontrol/matcher/MethodMatcherTest.java
--- a/hotspot/test/compiler/compilercontrol/matcher/MethodMatcherTest.java	Tue Jul 12 08:42:46 2016 +0000
+++ b/hotspot/test/compiler/compilercontrol/matcher/MethodMatcherTest.java	Tue Jul 12 18:24:48 2016 +0300
@@ -26,7 +26,8 @@
  * @bug 8135068
  * @summary Tests CompilerCommand's method matcher
  * @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib ../share /
+ * @library /testlibrary /test/lib /
+ *
  * @build compiler.compilercontrol.matcher.MethodMatcherTest
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                                sun.hotspot.WhiteBox$WhiteBoxPermission
@@ -36,10 +37,10 @@
 
 package compiler.compilercontrol.matcher;
 
-import jdk.test.lib.Pair;
 import compiler.compilercontrol.share.method.MethodDescriptor;
 import compiler.compilercontrol.share.method.MethodGenerator;
-import pool.PoolHelper;
+import compiler.compilercontrol.share.pool.PoolHelper;
+import jdk.test.lib.Pair;
 import sun.hotspot.WhiteBox;
 
 import java.lang.reflect.Executable;