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

Jump to bottom

8292716: Configure should check that jtreg is of the required version #9965

Closed
wants to merge 3 commits into from
Closed

8292716: Configure should check that jtreg is of the required version #9965

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b306035
8292717: Clean up checking of testing requirements in configure
magicus Aug 22, 2022
e140a4e
8292716: Configure should check that jtreg is of the required version
magicus Aug 22, 2022
bb11a9c
Merge branch 'master' of https://git.openjdk.org/jdk into jtreg-versi…
magicus Aug 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 19 additions & 0 deletions make/autoconf/lib-tests.m4
View file
Open in desktop
Expand Up @@ -27,6 +27,9 @@
# Setup libraries and functionalities needed to test the JDK.
################################################################################

# Minimum supported version
JTREG_MINIMUM_VERSION=6.1

###############################################################################
#
# Setup and check for gtest framework source files
Expand Down Expand Up @@ -213,6 +216,22 @@ AC_DEFUN_ONCE([LIB_TESTS_SETUP_JTREG],

UTIL_FIXUP_PATH(JT_HOME)
AC_SUBST(JT_HOME)

# Verify jtreg version

AC_MSG_CHECKING([jtreg version number])
# jtreg -version looks like this: "jtreg 6.1+1-19"
# Extract actual version part ("6.1" in this case)
jtreg_version_full=`$JAVA -jar $JT_HOME/lib/jtreg.jar -version | $HEAD -n 1 | $CUT -d ' ' -f 2`
jtreg_version=${jtreg_version_full/%+*}
AC_MSG_RESULT([$jtreg_version])

# This is a simplified version of TOOLCHAIN_CHECK_COMPILER_VERSION
comparable_actual_version=`$AWK -F. '{ printf("%05d%05d%05d%05d\n", [$]1, [$]2, [$]3, [$]4) }' <<< "$jtreg_version"`
comparable_minimum_version=`$AWK -F. '{ printf("%05d%05d%05d%05d\n", [$]1, [$]2, [$]3, [$]4) }' <<< "$JTREG_MINIMUM_VERSION"`
if test $comparable_actual_version -lt $comparable_minimum_version ; then
AC_MSG_ERROR([jtreg version is too old, at least version $JTREG_MINIMUM_VERSION is required])
fi
])

# Setup the JIB dependency resolver
Expand Down