Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update jtreg version selection #4853

Merged
merged 1 commit into from
Nov 3, 2023
Merged

Update jtreg version selection #4853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 15 additions & 22 deletions functional/security/Crypto/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,31 +52,25 @@
<mkdir dir="${DEST}" />
</target>
<if>
<or>
<matches pattern="^[89]{1}$" string="${JDK_VERSION}"/>
<matches pattern="^[1][023456]" string="${JDK_VERSION}"/>
</or>
<matches pattern="^([89]|1[02-6])$" string="${JDK_VERSION}"/>
<then>
<property name="jtregTar" value="jtreg_5_1_b01"/>
</then>
<elseif>
<matches pattern="^11$" string="${JDK_VERSION}"/>
<then>
<property name="jtregTar" value="jtreg_6_1"/>
</then>
</elseif>
<elseif>
<!-- versions 17, 21, 22 -->
<matches pattern="^(17|2[12])$" string="${JDK_VERSION}"/>
<then>
<property name="jtregTar" value="jtreg_7_3_1_1"/>
</then>
</elseif>
<else>
<if>
<matches pattern="^[1][17]" string="${JDK_VERSION}"/>
<then>
<property name="jtregTar" value="jtreg_6_1"/>
</then>
<else>
<if>
<matches pattern="^[1][89]" string="${JDK_VERSION}"/>
<then>
<property name="jtregTar" value="jtreg_6_1_1"/>
</then>
<else>
<property name="jtregTar" value="jtreg_7_1_1_1"/>
</else>
</if>
</else>
</if>
<fail message="Unsupported JDK version: ${JDK_VERSION}"/>
</else>
</if>
<if>
Expand Down Expand Up @@ -146,4 +140,3 @@
<antcall target="clean" inheritall="true" />
</target>
</project>

8 changes: 4 additions & 4 deletions openjdk/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@
<property name="jtregTar" value="jtreg_5_1_b01"/>
</then>
<elseif>
<!-- versions 11, 17 -->
<matches pattern="^1[17]$" string="${JDK_VERSION}"/>
<!-- version 11 -->
<matches pattern="^11$" string="${JDK_VERSION}"/>
<then>
<property name="jtregTar" value="jtreg_6_1"/>
</then>
</elseif>
<elseif>
<!-- version 21, 22 -->
<matches pattern="^2[12]$" string="${JDK_VERSION}"/>
<!-- versions 17, 21, 22 -->
<matches pattern="^(17|2[12])$" string="${JDK_VERSION}"/>
<then>
<property name="jtregTar" value="jtreg_7_3_1_1"/>
</then>
Expand Down