From f444f252b631859065d6f0c26a64a4a78edbd561 Mon Sep 17 00:00:00 2001 From: nm17 Date: Sun, 9 Mar 2025 20:09:54 +0400 Subject: [PATCH] ci: add --with-jtreg --- Dockerfile.openj9 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Dockerfile.openj9 b/Dockerfile.openj9 index d16887d..f41d7d0 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 unzip \ && rm -rf /var/lib/apt/lists/* WORKDIR /build @@ -18,6 +18,12 @@ RUN mkdir /build/bootjdk /build/dist \ && tar -xzf jdk21.tar.gz --directory=/build/bootjdk --strip-components=1 \ && rm -f jdk21.tar.gz +RUN wget --progress=dot:mega -O jtreg.zip https://builds.shipilev.net/jtreg/jtreg-7.5.1%2B1.zip \ + && unzip jtreg.zip /build/jtreg \ + && rm -rf jtreg.zip + +ENV JT_HOME=/build/jtreg + RUN find /build/bootjdk -name '*.so' | xargs execstack -c RUN git clone --single-branch --depth 1 \ @@ -27,7 +33,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/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)