install libubsan1 into test container

MBaesken · Jul 30, 2024 · 4a79243 · 4a79243
1 parent ba4f63b
commit 4a79243
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/test/hotspot/jtreg/containers/docker/DockerBasicTest.java b/test/hotspot/jtreg/containers/docker/DockerBasicTest.java
@@ -30,29 +30,18 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  *          jdk.jartool/sun.tools.jar
- * @build HelloDocker jdk.test.whitebox.WhiteBox
- *
- * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI DockerBasicTest
  */
 import jdk.test.lib.containers.docker.Common;
 import jdk.test.lib.containers.docker.DockerRunOptions;
 import jdk.test.lib.containers.docker.DockerTestUtils;
 import jdk.test.lib.Platform;
 import jdk.test.lib.Utils;
-import jdk.test.whitebox.WhiteBox;
 
 
 public class DockerBasicTest {
     private static final String imageNameAndTag = Common.imageName("basic");
 
     public static void main(String[] args) throws Exception {
-        WhiteBox wb = WhiteBox.getWhiteBox();
-        if (wb.isUbsanEnabled()) {
-            System.out.println("ubsan is enabled, avoid docker tests");
-            return;
-        }
-
         if (!DockerTestUtils.canTestDocker()) {
             return;
         }

diff --git a/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java b/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java
@@ -323,6 +323,7 @@ private static void generateDockerFile(Path dockerfile, String baseImage,
                                            String baseImageVersion) throws Exception {
         String template =
             "FROM %s:%s\n" +
+            "RUN apt-get install libubsan1\n" +
             "COPY /jdk /jdk\n" +
             "ENV JAVA_HOME=/jdk\n" +
             "CMD [\"/bin/bash\"]\n";