# HG changeset patch
# User mseledtsov
# Date 1493231171 25200
# Node ID 1593c061e6afe88ebdaa83af11347bc223b5ecc5
# Parent  f1ebd584cdf39e8db6ad1820ea8221b81002e689
8179243: [TESTBUG] CDS tests should be excluded from running with -UseCompressedOops
Summary: Used at-requires statements to exclude the affected tests
Reviewed-by: dholmes, jiangli, sspitsyn

diff -r f1ebd584cdf3 -r 1593c061e6af hotspot/test/runtime/SharedArchiveFile/ArchiveDoesNotExist.java
--- a/hotspot/test/runtime/SharedArchiveFile/ArchiveDoesNotExist.java	Wed Apr 26 13:20:23 2017 +0200
+++ b/hotspot/test/runtime/SharedArchiveFile/ArchiveDoesNotExist.java	Wed Apr 26 11:26:11 2017 -0700
@@ -27,6 +27,7 @@
  *          attempting to use CDS archive. JVM should exit gracefully
  *          when sharing mode is ON, and continue w/o sharing if sharing
  *          mode is AUTO.
+ * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
diff -r f1ebd584cdf3 -r 1593c061e6af hotspot/test/runtime/SharedArchiveFile/BootAppendTests.java
--- a/hotspot/test/runtime/SharedArchiveFile/BootAppendTests.java	Wed Apr 26 13:20:23 2017 +0200
+++ b/hotspot/test/runtime/SharedArchiveFile/BootAppendTests.java	Wed Apr 26 11:26:11 2017 -0700
@@ -24,6 +24,7 @@
 /**
  * @test
  * @summary Testing -Xbootclasspath/a support for CDS
+ * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
diff -r f1ebd584cdf3 -r 1593c061e6af hotspot/test/runtime/SharedArchiveFile/CdsDifferentCompactStrings.java
--- a/hotspot/test/runtime/SharedArchiveFile/CdsDifferentCompactStrings.java	Wed Apr 26 13:20:23 2017 +0200
+++ b/hotspot/test/runtime/SharedArchiveFile/CdsDifferentCompactStrings.java	Wed Apr 26 11:26:11 2017 -0700
@@ -25,6 +25,7 @@
  * @test CdsDifferentCompactStrings
  * @summary CDS (class data sharing) requires the same -XX:[+-]CompactStrings
  *          setting between archive creation time and load time.
+ * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
diff -r f1ebd584cdf3 -r 1593c061e6af hotspot/test/runtime/SharedArchiveFile/CdsDifferentObjectAlignment.java
--- a/hotspot/test/runtime/SharedArchiveFile/CdsDifferentObjectAlignment.java	Wed Apr 26 13:20:23 2017 +0200
+++ b/hotspot/test/runtime/SharedArchiveFile/CdsDifferentObjectAlignment.java	Wed Apr 26 11:26:11 2017 -0700
@@ -28,6 +28,7 @@
  *          This is a negative test; using  object alignment for loading that
  *          is different from object alignment for creating a CDS file
  *          should fail when loading.
+ * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
  * @library /test/lib
  * @bug 8025642
  * @modules java.base/jdk.internal.misc
diff -r f1ebd584cdf3 -r 1593c061e6af hotspot/test/runtime/SharedArchiveFile/CdsSameObjectAlignment.java
--- a/hotspot/test/runtime/SharedArchiveFile/CdsSameObjectAlignment.java	Wed Apr 26 13:20:23 2017 +0200
+++ b/hotspot/test/runtime/SharedArchiveFile/CdsSameObjectAlignment.java	Wed Apr 26 11:26:11 2017 -0700
@@ -25,6 +25,7 @@
  * @test CdsSameObjectAlignment
  * @summary Testing CDS (class data sharing) using varying object alignment.
  *          Using same object alignment for each dump/load pair
+ * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
diff -r f1ebd584cdf3 -r 1593c061e6af hotspot/test/runtime/SharedArchiveFile/DefaultUseWithClient.java
--- a/hotspot/test/runtime/SharedArchiveFile/DefaultUseWithClient.java	Wed Apr 26 13:20:23 2017 +0200
+++ b/hotspot/test/runtime/SharedArchiveFile/DefaultUseWithClient.java	Wed Apr 26 11:26:11 2017 -0700
@@ -24,6 +24,7 @@
 /*
  * @test DefaultUseWithClient
  * @summary Test default behavior of sharing with -client
+ * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
diff -r f1ebd584cdf3 -r 1593c061e6af hotspot/test/runtime/SharedArchiveFile/LargeSharedSpace.java
--- a/hotspot/test/runtime/SharedArchiveFile/LargeSharedSpace.java	Wed Apr 26 13:20:23 2017 +0200
+++ b/hotspot/test/runtime/SharedArchiveFile/LargeSharedSpace.java	Wed Apr 26 11:26:11 2017 -0700
@@ -26,6 +26,7 @@
  * @bug 8168790 8169870
  * @summary Test CDS dumping using specific space size without crashing.
  * The space size used in the test might not be suitable on windows.
+ * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
  * @requires (os.family != "windows")
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
diff -r f1ebd584cdf3 -r 1593c061e6af hotspot/test/runtime/SharedArchiveFile/LimitSharedSizes.java
--- a/hotspot/test/runtime/SharedArchiveFile/LimitSharedSizes.java	Wed Apr 26 13:20:23 2017 +0200
+++ b/hotspot/test/runtime/SharedArchiveFile/LimitSharedSizes.java	Wed Apr 26 11:26:11 2017 -0700
@@ -23,6 +23,7 @@
 
 /* @test LimitSharedSizes
  * @summary Test handling of limits on shared space size
+ * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
  * @library /test/lib /runtime/CommandLine/OptionsValidation/common
  * @modules java.base/jdk.internal.misc
  *          java.management
diff -r f1ebd584cdf3 -r 1593c061e6af hotspot/test/runtime/SharedArchiveFile/PrintSharedArchiveAndExit.java
--- a/hotspot/test/runtime/SharedArchiveFile/PrintSharedArchiveAndExit.java	Wed Apr 26 13:20:23 2017 +0200
+++ b/hotspot/test/runtime/SharedArchiveFile/PrintSharedArchiveAndExit.java	Wed Apr 26 11:26:11 2017 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 8066670
  * @summary Testing -XX:+PrintSharedArchiveAndExit option
+ * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
diff -r f1ebd584cdf3 -r 1593c061e6af hotspot/test/runtime/SharedArchiveFile/SASymbolTableTest.java
--- a/hotspot/test/runtime/SharedArchiveFile/SASymbolTableTest.java	Wed Apr 26 13:20:23 2017 +0200
+++ b/hotspot/test/runtime/SharedArchiveFile/SASymbolTableTest.java	Wed Apr 26 11:26:11 2017 -0700
@@ -24,6 +24,7 @@
 /*
  * @test SASymbolTableTest
  * @summary Walk symbol table using SA, with and without CDS.
+ * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          jdk.hotspot.agent/sun.jvm.hotspot.oops
diff -r f1ebd584cdf3 -r 1593c061e6af hotspot/test/runtime/SharedArchiveFile/SharedArchiveFile.java
--- a/hotspot/test/runtime/SharedArchiveFile/SharedArchiveFile.java	Wed Apr 26 13:20:23 2017 +0200
+++ b/hotspot/test/runtime/SharedArchiveFile/SharedArchiveFile.java	Wed Apr 26 11:26:11 2017 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 8014138
  * @summary Testing new -XX:SharedArchiveFile=<file-name> option
+ * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
@@ -40,14 +41,14 @@
 // methods to form command line to create/use shared archive.
 public class SharedArchiveFile {
     public static void main(String[] args) throws Exception {
-        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(true,
                                 "-XX:+UnlockDiagnosticVMOptions",
                                 "-XX:SharedArchiveFile=./SharedArchiveFile.jsa",
                                 "-Xshare:dump");
         OutputAnalyzer out = CDSTestUtils.executeAndLog(pb, "SharedArchiveFile");
         CDSTestUtils.checkDump(out);
 
-        pb = ProcessTools.createJavaProcessBuilder(
+        pb = ProcessTools.createJavaProcessBuilder(true,
                               "-XX:+UnlockDiagnosticVMOptions",
                               "-XX:SharedArchiveFile=./SharedArchiveFile.jsa",
                               "-Xshare:on", "-version");
diff -r f1ebd584cdf3 -r 1593c061e6af hotspot/test/runtime/SharedArchiveFile/SharedBaseAddress.java
--- a/hotspot/test/runtime/SharedArchiveFile/SharedBaseAddress.java	Wed Apr 26 13:20:23 2017 +0200
+++ b/hotspot/test/runtime/SharedArchiveFile/SharedBaseAddress.java	Wed Apr 26 11:26:11 2017 -0700
@@ -25,6 +25,7 @@
  * @test SharedBaseAddress
  * @summary Test variety of values for SharedBaseAddress, making sure
  *          VM handles normal values as well as edge values w/o a crash.
+ * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
diff -r f1ebd584cdf3 -r 1593c061e6af hotspot/test/runtime/SharedArchiveFile/SharedSymbolTableBucketSize.java
--- a/hotspot/test/runtime/SharedArchiveFile/SharedSymbolTableBucketSize.java	Wed Apr 26 13:20:23 2017 +0200
+++ b/hotspot/test/runtime/SharedArchiveFile/SharedSymbolTableBucketSize.java	Wed Apr 26 11:26:11 2017 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 8059510
  * @summary Test SharedSymbolTableBucketSize option
+ * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
diff -r f1ebd584cdf3 -r 1593c061e6af hotspot/test/runtime/SharedArchiveFile/SpaceUtilizationCheck.java
--- a/hotspot/test/runtime/SharedArchiveFile/SpaceUtilizationCheck.java	Wed Apr 26 13:20:23 2017 +0200
+++ b/hotspot/test/runtime/SharedArchiveFile/SpaceUtilizationCheck.java	Wed Apr 26 11:26:11 2017 -0700
@@ -24,6 +24,7 @@
 /*
  * @test SpaceUtilizationCheck
  * @summary Check if the space utilization for shared spaces is adequate
+ * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
diff -r f1ebd584cdf3 -r 1593c061e6af hotspot/test/runtime/SharedArchiveFile/TestInterpreterMethodEntries.java
--- a/hotspot/test/runtime/SharedArchiveFile/TestInterpreterMethodEntries.java	Wed Apr 26 13:20:23 2017 +0200
+++ b/hotspot/test/runtime/SharedArchiveFile/TestInterpreterMethodEntries.java	Wed Apr 26 11:26:11 2017 -0700
@@ -26,6 +26,7 @@
  * @bug 8169711
  * @summary Test interpreter method entries for intrinsics with CDS (class data sharing)
  *          and different settings of the intrinsic flag during dump/use of the archive.
+ * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management