# HG changeset patch
# User mseledtsov
# Date 1533175647 25200
# Node ID 5cc6acb1d6b60d42a70445f3af72206b32827c9c
# Parent  d56dd9798d546723551717b0e733fa738b8e6fa6
8185531: [TESTBUG] Improve test configuration for shared strings
Summary: Added extra test configurations to the tests
Reviewed-by: iklam, gziemski

diff -r d56dd9798d54 -r 5cc6acb1d6b6 test/hotspot/jtreg/runtime/appcds/sharedStrings/ExerciseGC.java
--- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/ExerciseGC.java	Wed Aug 01 19:14:04 2018 -0400
+++ b/test/hotspot/jtreg/runtime/appcds/sharedStrings/ExerciseGC.java	Wed Aug 01 19:07:27 2018 -0700
@@ -33,6 +33,8 @@
  * @build HelloStringGC sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main ExerciseGC
+ * @run main/othervm -XX:+UseStringDeduplication ExerciseGC
+ * @run main/othervm -XX:-CompactStrings ExerciseGC
  */
 public class ExerciseGC {
     public static void main(String[] args) throws Exception {
diff -r d56dd9798d54 -r 5cc6acb1d6b6 test/hotspot/jtreg/runtime/appcds/sharedStrings/IncompatibleOptions.java
--- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/IncompatibleOptions.java	Wed Aug 01 19:14:04 2018 -0400
+++ b/test/hotspot/jtreg/runtime/appcds/sharedStrings/IncompatibleOptions.java	Wed Aug 01 19:07:27 2018 -0700
@@ -36,6 +36,8 @@
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
  * @build HelloString
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. IncompatibleOptions
+ * @run main/othervm -XX:+UseStringDeduplication -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. IncompatibleOptions
+ * @run main/othervm -XX:-CompactStrings -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. IncompatibleOptions
  */
 
 import jdk.test.lib.Asserts;
diff -r d56dd9798d54 -r 5cc6acb1d6b6 test/hotspot/jtreg/runtime/appcds/sharedStrings/InternSharedString.java
--- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/InternSharedString.java	Wed Aug 01 19:14:04 2018 -0400
+++ b/test/hotspot/jtreg/runtime/appcds/sharedStrings/InternSharedString.java	Wed Aug 01 19:07:27 2018 -0700
@@ -34,6 +34,8 @@
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main InternSharedString
+ * @run main/othervm -XX:+UseStringDeduplication InternSharedString
+ * @run main/othervm -XX:-CompactStrings InternSharedString
  */
 
 public class InternSharedString {
diff -r d56dd9798d54 -r 5cc6acb1d6b6 test/hotspot/jtreg/runtime/appcds/sharedStrings/InvalidFileFormat.java
--- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/InvalidFileFormat.java	Wed Aug 01 19:14:04 2018 -0400
+++ b/test/hotspot/jtreg/runtime/appcds/sharedStrings/InvalidFileFormat.java	Wed Aug 01 19:07:27 2018 -0700
@@ -32,6 +32,8 @@
  *          jdk.jartool/sun.tools.jar
  * @build HelloString
  * @run main InvalidFileFormat
+ * @run main/othervm -XX:+UseStringDeduplication InvalidFileFormat
+ * @run main/othervm -XX:-CompactStrings InvalidFileFormat
  */
 
 import jdk.test.lib.process.OutputAnalyzer;
diff -r d56dd9798d54 -r 5cc6acb1d6b6 test/hotspot/jtreg/runtime/appcds/sharedStrings/LargePages.java
--- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/LargePages.java	Wed Aug 01 19:14:04 2018 -0400
+++ b/test/hotspot/jtreg/runtime/appcds/sharedStrings/LargePages.java	Wed Aug 01 19:07:27 2018 -0700
@@ -32,6 +32,8 @@
  *          jdk.jartool/sun.tools.jar
  * @build HelloString
  * @run main LargePages
+ * @run main/othervm -XX:+UseStringDeduplication LargePages
+ * @run main/othervm -XX:-CompactStrings LargePages
  */
 public class LargePages {
     public static void main(String[] args) throws Exception {
diff -r d56dd9798d54 -r 5cc6acb1d6b6 test/hotspot/jtreg/runtime/appcds/sharedStrings/LockSharedStrings.java
--- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/LockSharedStrings.java	Wed Aug 01 19:14:04 2018 -0400
+++ b/test/hotspot/jtreg/runtime/appcds/sharedStrings/LockSharedStrings.java	Wed Aug 01 19:07:27 2018 -0700
@@ -34,6 +34,8 @@
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main LockSharedStrings
+ * @run main/othervm -XX:+UseStringDeduplication LockSharedStrings
+ * @run main/othervm -XX:-CompactStrings LockSharedStrings
  */
 
 public class LockSharedStrings {
diff -r d56dd9798d54 -r 5cc6acb1d6b6 test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsBasic.java
--- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsBasic.java	Wed Aug 01 19:14:04 2018 -0400
+++ b/test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsBasic.java	Wed Aug 01 19:07:27 2018 -0700
@@ -32,6 +32,8 @@
  *          jdk.jartool/sun.tools.jar
  * @build HelloString
  * @run main SharedStringsBasic
+ * @run main/othervm -XX:+UseStringDeduplication SharedStringsBasic
+ * @run main/othervm -XX:-CompactStrings SharedStringsBasic
  */
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
diff -r d56dd9798d54 -r 5cc6acb1d6b6 test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsBasicPlus.java
--- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsBasicPlus.java	Wed Aug 01 19:14:04 2018 -0400
+++ b/test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsBasicPlus.java	Wed Aug 01 19:07:27 2018 -0700
@@ -33,6 +33,8 @@
  * @build HelloStringPlus sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main SharedStringsBasicPlus
+ * @run main/othervm -XX:+UseStringDeduplication SharedStringsBasicPlus
+ * @run main/othervm -XX:-CompactStrings SharedStringsBasicPlus
  */
 
 public class SharedStringsBasicPlus {
diff -r d56dd9798d54 -r 5cc6acb1d6b6 test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsStress.java
--- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsStress.java	Wed Aug 01 19:14:04 2018 -0400
+++ b/test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsStress.java	Wed Aug 01 19:07:27 2018 -0700
@@ -30,6 +30,8 @@
  * @modules jdk.jartool/sun.tools.jar
  * @build HelloString
  * @run main SharedStringsStress
+ * @run main/othervm -XX:+UseStringDeduplication SharedStringsStress
+ * @run main/othervm -XX:-CompactStrings SharedStringsStress
  */
 import java.io.File;
 import java.io.FileOutputStream;
diff -r d56dd9798d54 -r 5cc6acb1d6b6 test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsWbTest.java
--- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsWbTest.java	Wed Aug 01 19:14:04 2018 -0400
+++ b/test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsWbTest.java	Wed Aug 01 19:07:27 2018 -0700
@@ -33,6 +33,8 @@
  * @build sun.hotspot.WhiteBox SharedStringsWb
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main SharedStringsWbTest
+ * @run main/othervm -XX:+UseStringDeduplication SharedStringsWbTest
+ * @run main/othervm -XX:-CompactStrings SharedStringsWbTest
  */
 
 import java.io.*;
diff -r d56dd9798d54 -r 5cc6acb1d6b6 test/hotspot/jtreg/runtime/appcds/sharedStrings/SysDictCrash.java
--- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/SysDictCrash.java	Wed Aug 01 19:14:04 2018 -0400
+++ b/test/hotspot/jtreg/runtime/appcds/sharedStrings/SysDictCrash.java	Wed Aug 01 19:07:27 2018 -0700
@@ -32,6 +32,8 @@
  * @modules java.base/jdk.internal.misc
  * @modules java.management
  * @run main SysDictCrash
+ * @run main/othervm -XX:+UseStringDeduplication SysDictCrash
+ * @run main/othervm -XX:-CompactStrings SysDictCrash
  */
 
 import jdk.test.lib.process.OutputAnalyzer;