# HG changeset patch
# User ctornqvi
# Date 1445454621 0
# Node ID 7192a8870c59b7846e32525d781b551ac7f1d3b8
# Parent  c2d95df2c54ec0bb8a77cbba5c597feb19474a35# Parent  5db75ff01d96b1c4650632dc472e9bc24564c8a9
Merge

diff -r c2d95df2c54e -r 7192a8870c59 hotspot/test/compiler/jvmci/compilerToVM/GetConstantPoolTest.java
--- a/hotspot/test/compiler/jvmci/compilerToVM/GetConstantPoolTest.java	Mon Oct 19 15:03:58 2015 +0200
+++ b/hotspot/test/compiler/jvmci/compilerToVM/GetConstantPoolTest.java	Wed Oct 21 19:10:21 2015 +0000
@@ -27,6 +27,7 @@
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
  * @library /testlibrary /../../test/lib /
+ * @ignore 8139385
  * @compile ../common/CompilerToVMHelper.java
  * @build sun.hotspot.WhiteBox
  *        compiler.jvmci.compilerToVM.GetConstantPoolTest