infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 03:58:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

8375692: Hotspot container tests assert with non-ascii vendor name

Browse Source 
Reviewed-by: naoto, dholmes, syan
This commit is contained in:
Severin Gehwolf 2026-01-23 16:55:38 +00:00
parent 6f6966b28b
commit 3fb118a29e
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/hotspot/jtreg/containers/docker/TestJcmd.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2021, 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
@ -143,6 +143,7 @@ public class TestJcmd {
sb.append(String.format("FROM %s:%s\n", DockerfileConfig.getBaseImageName(),
DockerfileConfig.getBaseImageVersion()));
sb.append("COPY /jdk /jdk\n");
sb.append("ENV LANG=C.UTF-8\n");
sb.append("ENV JAVA_HOME=/jdk\n");
if (!IS_PODMAN) { // only needed for docker

4
test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetricsSubgroup.java
View File

@ -91,7 +91,8 @@ public class TestDockerMemoryMetricsSubgroup {
.addDockerOpts("--volume", Utils.TEST_JDK + ":/jdk")
.addDockerOpts("--privileged")
.addDockerOpts("--cgroupns=" + (privateNamespace ? "private" : "host"))
.addDockerOpts("--memory", outerGroupMemorySize);
.addDockerOpts("--memory", outerGroupMemorySize)
.addDockerOpts("-e", "LANG=C.UTF-8");
opts.addClassOptions("mkdir -p /sys/fs/cgroup/memory/test ; " +
"echo " + innerSize + " > /sys/fs/cgroup/memory/test/memory.limit_in_bytes ; " +
"echo $$ > /sys/fs/cgroup/memory/test/cgroup.procs ; " +
@ -112,6 +113,7 @@ public class TestDockerMemoryMetricsSubgroup {
.addDockerOpts("--volume", Utils.TEST_JDK + ":/jdk")
.addDockerOpts("--privileged")
.addDockerOpts("--cgroupns=" + (privateNamespace ? "private" : "host"))
.addDockerOpts("-e", "LANG=C.UTF-8")
.addDockerOpts("--memory", outerGroupMemorySize);
opts.addClassOptions("mkdir -p /sys/fs/cgroup/memory/test ; " +
"echo $$ > /sys/fs/cgroup/memory/test/cgroup.procs ; " +

3
test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 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
@ -380,6 +380,7 @@ public class DockerTestUtils {
}
template = template + "COPY /jdk /jdk\n" +
"ENV JAVA_HOME=/jdk\n" +
"ENV LANG=C.UTF-8\n" +
"CMD [\"/bin/bash\"]\n";
String dockerFileStr = String.format(template, baseImage, baseImageVersion);
Files.writeString(dockerfile, dockerFileStr);