From 80201b3af52959497f5a6515c61a8cb59db60ba5 Mon Sep 17 00:00:00 2001
From: nm17 <dannevergame@gmail.com>
Date: Sun, 9 Mar 2025 20:09:54 +0400
Subject: [PATCH 1/2] ci: add --with-jtreg
---
Dockerfile.openj9 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile.openj9 b/Dockerfile.openj9
index d16887d..fda1ec3 100644
--- a/Dockerfile.openj9
+++ b/Dockerfile.openj9
@@ -27,7 +27,7 @@ RUN git clone --single-branch --depth 1 \
WORKDIR /build/src
RUN bash get_source.sh
-RUN bash configure --with-boot-jdk=/build/bootjdk --with-openssl=system --with-extra-ldflags="-Wl,-z,noexecstack"
+RUN bash configure --with-jtreg=/build/bootjdk/jdk/jtreg --with-boot-jdk=/build/bootjdk --with-openssl=system --with-extra-ldflags="-Wl,-z,noexecstack"
RUN make all JOBS=$(nproc)
RUN make test TEST=tier2 JOBS=$(nproc)
From 828d183939250aa5ff8710303d5596098929645c Mon Sep 17 00:00:00 2001
From: nm17 <dannevergame@gmail.com>
Date: Sun, 9 Mar 2025 20:09:54 +0400
Subject: [PATCH 2/2] ci: add --with-jtreg
---
Dockerfile.openj9 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Dockerfile.openj9 b/Dockerfile.openj9
index d16887d..8cdeedc 100644
--- a/Dockerfile.openj9
+++ b/Dockerfile.openj9
@@ -8,7 +8,7 @@ RUN apt update \
ant ant-contrib autoconf build-essential ca-certificates cmake cpio curl file gcc-14 g++-14 gdb git \
libasound2-dev libcups2-dev libdwarf-dev libelf-dev libexpat1-dev libffi-dev libfontconfig libfontconfig1-dev \
libfreetype6-dev libnuma-dev libssl-dev libx11-dev libxext-dev libxrandr-dev libxrender-dev libxt-dev libxtst-dev \
- make nasm pkg-config python3 python3-dev rsync systemtap-sdt-dev unzip wget xvfb zip zlib1g-dev execstack \
+ make nasm pkg-config python3 python3-dev rsync systemtap-sdt-dev unzip wget xvfb zip zlib1g-dev execstack jtreg7 \
&& rm -rf /var/lib/apt/lists/*
WORKDIR /build
@@ -27,7 +27,7 @@ RUN git clone --single-branch --depth 1 \
WORKDIR /build/src
RUN bash get_source.sh
-RUN bash configure --with-boot-jdk=/build/bootjdk --with-openssl=system --with-extra-ldflags="-Wl,-z,noexecstack"
+RUN bash configure --with-jtreg --with-boot-jdk=/build/bootjdk --with-openssl=system --with-extra-ldflags="-Wl,-z,noexecstack"
RUN make all JOBS=$(nproc)
RUN make test TEST=tier2 JOBS=$(nproc)