infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-07-02 15:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

8386654: Test tools/javac/SystemFilesClosed.java fails on systems without lsof

Browse Source 
Reviewed-by: jpai, vromero, liach
This commit is contained in:
Dusan Balek 2026-06-16 06:52:52 +00:00 committed by Chen Liang
parent 7d136f802f
commit a84cd26198
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
test/langtools/tools/javac/SystemFilesClosed.java
View File

@ -31,18 +31,22 @@
*/
import java.io.BufferedReader;
import java.io.File;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URI;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import javax.tools.JavaCompiler;
import javax.tools.JavaFileObject;
import javax.tools.SimpleJavaFileObject;
import javax.tools.StandardJavaFileManager;
import javax.tools.ToolProvider;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInfo;
@ -53,6 +57,11 @@ public class SystemFilesClosed {
@Test
void testSystemFilesClosed() throws Exception {
// Probe lsof availability before doing the jlink/compile work
if (!lsofCommand().isPresent()) {
Assumptions.abort("lsof command is not available on this system");
}
String targetSystem = base.toString();
int ret = java.util.spi.ToolProvider.findFirst("jlink")
.orElseThrow()
@ -83,7 +92,8 @@ public class SystemFilesClosed {
}
Process process = new ProcessBuilder()
.command("lsof", "-p", String.valueOf(ProcessHandle.current().pid()))
.command(lsofCommand().orElseThrow(() -> new RuntimeException("lsof command is not available on this system")),
"-p", String.valueOf(ProcessHandle.current().pid()))
.redirectOutput(ProcessBuilder.Redirect.PIPE)
.redirectError(ProcessBuilder.Redirect.INHERIT)
.start();
@ -103,4 +113,17 @@ public class SystemFilesClosed {
.orElseThrow()
.getName());
}
static Optional<String> lsofCommandCache = Arrays.stream(new String[] {
"/usr/bin/lsof",
"/usr/sbin/lsof",
"/bin/lsof",
"/sbin/lsof",
"/usr/local/bin/lsof"})
.filter(args -> new File(args).exists())
.findFirst();
static Optional<String> lsofCommand() {
return lsofCommandCache;
}
}