8213410: UseCompressedOops requirement check fails fails on 32-bit system

Reviewed-by: dholmes

test/hotspot/jtreg/gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java

@@ -25,7 +25,8 @@
  * @test CompressedClassSpaceSizeInJmapHeap
  * @bug 8004924
  * @summary Checks that jmap -heap contains the flag CompressedClassSpaceSize
- * @requires vm.hasSAandCanAttach & vm.opt.final.UseCompressedOops
+ * @requires vm.hasSAandCanAttach
+ * @requires vm.bits == 64 & vm.opt.final.UseCompressedOops == true
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management

test/hotspot/jtreg/gc/metaspace/TestMetaspaceMemoryPool.java

@@ -32,7 +32,7 @@ import static jdk.test.lib.Asserts.*;
  * @bug 8000754
  * @summary Tests that a MemoryPoolMXBeans is created for metaspace and that a
  *          MemoryManagerMXBean is created.
- * @requires vm.opt.final.UseCompressedOops
+ * @requires vm.bits == 64 & vm.opt.final.UseCompressedOops == true
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management

test/hotspot/jtreg/runtime/CompressedOops/CompressedClassPointers.java

@@ -25,8 +25,7 @@
  * @test
  * @bug 8024927
  * @summary Testing address of compressed class pointer space as best as possible.
- * @requires vm.opt.final.UseCompressedOops
- * @requires vm.bits == 64
+ * @requires vm.bits == 64 & vm.opt.final.UseCompressedOops == true
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management

test/hotspot/jtreg/runtime/CompressedOops/CompressedClassSpaceSize.java

@@ -25,7 +25,7 @@
  * @test
  * @bug 8022865
  * @summary Tests for the -XX:CompressedClassSpaceSize command line option
- * @requires vm.opt.final.UseCompressedOops
+ * @requires vm.bits == 64 & vm.opt.final.UseCompressedOops == true
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management

test/hotspot/jtreg/runtime/Metaspace/MaxMetaspaceSizeTest.java

@@ -26,8 +26,7 @@ import jdk.test.lib.process.OutputAnalyzer;
 
 /*
  * @test MaxMetaspaceSizeTest
- * @requires vm.bits == "64"
- * @requires vm.opt.final.UseCompressedOops
+ * @requires vm.bits == 64 & vm.opt.final.UseCompressedOops == true
  * @bug 8087291
  * @library /test/lib
  * @run main/othervm MaxMetaspaceSizeTest

test/hotspot/jtreg/runtime/logging/CompressedOopsTest.java

@@ -24,8 +24,7 @@
 /*
  * @test
  * @bug 8149991
- * @requires (sun.arch.data.model == "64")
- * @requires vm.opt.final.UseCompressedOops
+ * @requires vm.bits == 64 & vm.opt.final.UseCompressedOops == true
  * @summary -Xlog:gc+heap+coops=info should have output from the code
  * @library /test/lib
  * @modules java.base/jdk.internal.misc