From 63c1cb3ad1cc3be22fd8b401894acf37683dad67 Mon Sep 17 00:00:00 2001 From: Frederic Thevenet Date: Mon, 2 Mar 2026 18:30:29 +0000 Subject: [PATCH] 8378702: jdk.test.lib.Platform.isMusl() may return false negative on Alpine Linux Reviewed-by: stuefe, rriggs --- test/lib/jdk/test/lib/Platform.java | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/test/lib/jdk/test/lib/Platform.java b/test/lib/jdk/test/lib/Platform.java index 75fdef048bc..170e53930d8 100644 --- a/test/lib/jdk/test/lib/Platform.java +++ b/test/lib/jdk/test/lib/Platform.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,6 +33,7 @@ import java.nio.file.Paths; import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; +import java.util.stream.Stream; import static java.util.Locale.ROOT; public class Platform { @@ -188,14 +189,17 @@ public class Platform { } public static boolean isMusl() { - try { - ProcessBuilder pb = new ProcessBuilder("ldd", "--version"); + var lddPath = Stream.of("/bin/ldd", "/usr/bin/ldd").filter(p -> Files.exists(Path.of(p))).findFirst(); + if (lddPath.isPresent()) { + ProcessBuilder pb = new ProcessBuilder(lddPath.get(), "--version"); pb.redirectErrorStream(true); - Process p = pb.start(); - BufferedReader b = new BufferedReader(new InputStreamReader(p.getInputStream())); - String l = b.readLine(); - if (l != null && l.contains("musl")) { return true; } - } catch(Exception e) { + try (Process p = pb.start()) { + BufferedReader b = new BufferedReader(new InputStreamReader(p.getInputStream())); + String l = b.readLine(); + return (l != null && l.contains("musl")); + } catch (Exception e) { + e.printStackTrace(); + } } return false; }