Skip to content

Commit

Permalink
Fix ImageIO test to work with 22.2-dev
Browse files Browse the repository at this point in the history
libmanagement_ext.a added in 22.2 with
oracle/graal@a0e6a3a
  • Loading branch information
zakkak committed Apr 6, 2022
1 parent 98791f5 commit 7eab14f
Showing 1 changed file with 6 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.io.FileUtils;
import org.graalvm.home.Version;
import org.graalvm.tests.integration.utils.Apps;
import org.graalvm.tests.integration.utils.LogBuilder;
import org.graalvm.tests.integration.utils.Logs;
Expand Down Expand Up @@ -467,8 +468,11 @@ public void imageioAWT(TestInfo testInfo, Apps app) throws IOException, Interrup
final File executable = new File(appDir.getAbsolutePath() + File.separator + "target", "imageio");
//TODO: This might be too fragile... e.g. order shouldn't matter.
final String toFind;
// Harfbuzz removed: https://github.com/graalvm/mandrel/issues/286
if (UsedVersion.jdkFeature(inContainer) > 11 || UsedVersion.jdkUpdate(inContainer) > 12) {
if (UsedVersion.getVersion(inContainer).compareTo(Version.create(22, 2, 0)) >= 0) {
// libmanagement_ext.a added in 22.2 with https://github.com/oracle/graal/commit/a0e6a3aeb8b63f6c06dc3554c342075534d90796
toFind = "libnet.a|libjavajpeg.a|libnio.a|libmanagement_ext.a|liblibchelper.a|libjava.a|liblcms.a|libfontmanager.a|libawt_headless.a|libawt.a|libfdlibm.a|libzip.a|libjvm.a";
} else if (UsedVersion.jdkFeature(inContainer) > 11 || UsedVersion.jdkUpdate(inContainer) > 12) {
// Harfbuzz removed: https://github.com/graalvm/mandrel/issues/286
toFind = "libnet.a|libjavajpeg.a|libnio.a|liblibchelper.a|libjava.a|liblcms.a|libfontmanager.a|libawt_headless.a|libawt.a|libfdlibm.a|libzip.a|libjvm.a";
} else {
toFind = "libnet.a|libjavajpeg.a|libnio.a|liblibchelper.a|libjava.a|liblcms.a|libfontmanager.a|libawt_headless.a|libawt.a|libharfbuzz.a|libfdlibm.a|libzip.a|libjvm.a";
Expand Down

0 comments on commit 7eab14f

Please sign in to comment.