stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8322018: Test java/lang/String/CompactString/MaxSizeUTF16String.java fails with -Xcomp

Browse Source 
Reviewed-by: jpai
This commit is contained in:
Roger Riggs 2023-12-15 16:13:36 +00:00
parent bdebf198bb
commit 6311dabe68
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test/jdk/java/lang/String/CompactString/MaxSizeUTF16String.java
View File

@ -30,9 +30,11 @@ import java.nio.charset.StandardCharsets;
* @test
* @bug 8077559 8321180
* @summary Tests Compact String for maximum size strings
* @requires os.maxMemory >= 7g & vm.bits == 64
* @run junit/othervm -XX:+CompactStrings -Xmx7g MaxSizeUTF16String
* @run junit/othervm -XX:-CompactStrings -Xmx7g MaxSizeUTF16String
* @requires os.maxMemory >= 8g & vm.bits == 64
* @requires vm.flagless
* @run junit/othervm -XX:+CompactStrings -Xmx8g MaxSizeUTF16String
* @run junit/othervm -XX:-CompactStrings -Xmx8g MaxSizeUTF16String
* @run junit/othervm -Xcomp -Xmx8g MaxSizeUTF16String
*/
public class MaxSizeUTF16String {
@ -40,6 +42,8 @@ public class MaxSizeUTF16String {
private final static int MAX_UTF16_STRING_LENGTH = Integer.MAX_VALUE / 2;
private final static String EXPECTED_OOME_MESSAGE = "UTF16 String size is";
private final static String EXPECTED_VM_LIMIT_MESSAGE = "Requested array size exceeds VM limit";
private final static String UNEXPECTED_JAVA_HEAP_SPACE = "Java heap space";
// Create a large UTF-8 byte array with a single non-latin1 character
private static byte[] generateUTF8Data(int byteSize) {
@ -74,7 +78,12 @@ public class MaxSizeUTF16String {
fail("Expected OutOfMemoryError with message prefix: " + EXPECTED_OOME_MESSAGE);
}
} catch (OutOfMemoryError ex) {
if (!ex.getMessage().startsWith(EXPECTED_OOME_MESSAGE)) {
if (ex.getMessage().equals(UNEXPECTED_JAVA_HEAP_SPACE)) {
// Insufficient heap size
throw ex;
}
if (!ex.getMessage().startsWith(EXPECTED_OOME_MESSAGE) &&
!ex.getMessage().startsWith(EXPECTED_VM_LIMIT_MESSAGE)) {
fail("Failed: Not the OutOfMemoryError expected", ex);
}
}
@ -98,7 +107,12 @@ public class MaxSizeUTF16String {
fail("Expected OutOfMemoryError with message prefix: " + EXPECTED_OOME_MESSAGE);
}
} catch (OutOfMemoryError ex) {
if (!ex.getMessage().startsWith(EXPECTED_OOME_MESSAGE)) {
if (ex.getMessage().equals(UNEXPECTED_JAVA_HEAP_SPACE)) {
// Insufficient heap size
throw ex;
}
if (!ex.getMessage().startsWith(EXPECTED_OOME_MESSAGE) &&
!ex.getMessage().startsWith(EXPECTED_VM_LIMIT_MESSAGE)) {
throw new RuntimeException("Wrong exception message: " + ex.getMessage(), ex);
}
}