diff -r 5d4c3724e4c7 -r 03fbcd06b4c0 src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CheckGraalIntrinsics.java --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CheckGraalIntrinsics.java Thu Nov 14 11:16:14 2019 -0800 +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CheckGraalIntrinsics.java Thu Nov 14 12:21:00 2019 -0800 @@ -158,11 +158,15 @@ private static Collection add(Collection c, String... elements) { String[] sorted = elements.clone(); Arrays.sort(sorted); - for (int i = 0; i < elements.length; i++) { - if (!elements[i].equals(sorted[i])) { - // Let's keep the list sorted for easier visual inspection - fail("Element %d is out of order, \"%s\"", i, elements[i]); + if (!Arrays.equals(elements, sorted)) { + int width = 2 + Arrays.asList(elements).stream().map(String::length).reduce(0, Integer::max); + Formatter fmt = new Formatter(); + fmt.format("%-" + width + "s | sorted%n", "original"); + fmt.format("%s%n", new String(new char[width * 2 + 2]).replace('\0', '=')); + for (int i = 0; i < elements.length; i++) { + fmt.format("%-" + width + "s | %s%n", elements[i], sorted[i]); } + fail("Elements not sorted alphabetically:%n%s", fmt); } c.addAll(Arrays.asList(elements)); return c; @@ -517,8 +521,8 @@ // AES intrinsics if (!config.useAESIntrinsics) { add(ignore, + "com/sun/crypto/provider/AESCrypt." + aesDecryptName + "([BI[BI)V", "com/sun/crypto/provider/AESCrypt." + aesEncryptName + "([BI[BI)V", - "com/sun/crypto/provider/AESCrypt." + aesDecryptName + "([BI[BI)V", "com/sun/crypto/provider/CipherBlockChaining." + cbcDecryptName + "([BII[BI)I", "com/sun/crypto/provider/CipherBlockChaining." + cbcEncryptName + "([BII[BI)I"); }