Skip to content

Commit

Permalink
8185531: [TESTBUG] Improve test configuration for shared strings
Browse files Browse the repository at this point in the history 
Added extra test configurations to the tests

Reviewed-by: iklam, gziemski
  • Loading branch information
Mikhailo Seledtsov committed Aug 2, 2018
1 parent 501fc49 commit 8a5467b
Show file tree
Hide file tree
Showing 11 changed files with 22 additions and 0 deletions.
2 changes: 2 additions & 0 deletions test/hotspot/jtreg/runtime/appcds/sharedStrings/ExerciseGC.java
View file
Expand Up @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions test/hotspot/jtreg/runtime/appcds/sharedStrings/IncompatibleOptions.java
View file
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions test/hotspot/jtreg/runtime/appcds/sharedStrings/InternSharedString.java
View file
Expand Up @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions test/hotspot/jtreg/runtime/appcds/sharedStrings/InvalidFileFormat.java
View file
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions test/hotspot/jtreg/runtime/appcds/sharedStrings/LargePages.java
View file
Expand Up @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions test/hotspot/jtreg/runtime/appcds/sharedStrings/LockSharedStrings.java
View file
Expand Up @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsBasic.java
View file
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsBasicPlus.java
View file
Expand Up @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsStress.java
View file
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsWbTest.java
View file
Expand Up @@ -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.*;
Expand Down
2 changes: 2 additions & 0 deletions test/hotspot/jtreg/runtime/appcds/sharedStrings/SysDictCrash.java
View file
Expand Up @@ -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;
Expand Down

2 comments on commit 8a5467b

@SoniaZaldana
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 8a5467b Nov 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@SoniaZaldana the backport was successfully created on the branch SoniaZaldana-backport-8a5467b9 in my personal fork of openjdk/jdk11u-dev. To create a pull request with this backport targeting openjdk/jdk11u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 8a5467b9 from the openjdk/jdk repository.

The commit being backported was authored by Mikhailo Seledtsov on 2 Aug 2018 and was reviewed by Ioi Lam and Gerard Ziemski.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk11u-dev:

$ git fetch https://github.com/openjdk-bots/jdk11u-dev.git SoniaZaldana-backport-8a5467b9:SoniaZaldana-backport-8a5467b9
$ git checkout SoniaZaldana-backport-8a5467b9
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk11u-dev.git SoniaZaldana-backport-8a5467b9

Please sign in to comment.