# HG changeset patch
# User mikael
# Date 1462579924 0
# Node ID 88cfc4596560f0789afdfd27e0e0cd919087cc43
# Parent  fe30fdab0f62fe88f528d1926b0eebf99e9f8e76# Parent  22e0874d236e8fa202b27f7276ff7ebd649346dc
Merge

diff -r fe30fdab0f62 -r 88cfc4596560 hotspot/test/compiler/jvmci/compilerToVM/ReadUncompressedOopTest.java
--- a/hotspot/test/compiler/jvmci/compilerToVM/ReadUncompressedOopTest.java	Fri May 06 15:59:26 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/ReadUncompressedOopTest.java	Sat May 07 00:12:04 2016 +0000
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 8136421
+ * @ignore 8155216
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library / /testlibrary /test/lib/
  * @library ../common/patches