stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8300806: Update googletest to v1.13.0

Browse Source 
Reviewed-by: erikj, ihse
This commit is contained in:
Mikael Vidstedt 2023-01-25 18:27:26 +00:00
parent edf1e1ab4a
commit ccf2f5837b
7 changed files with 28 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/actions/get-gtest/action.yml vendored
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -43,7 +43,7 @@ runs:
uses: actions/checkout@v3 uses: actions/checkout@v3
with: with:
repository: google/googletest repository: google/googletest
ref: 'release-${{ steps.version.outputs.value }}' ref: 'v${{ steps.version.outputs.value }}'
path: gtest path: gtest
- name: 'Export path to where GTest is installed' - name: 'Export path to where GTest is installed'

10
doc/building.html
View File

@ -1094,14 +1094,14 @@ just unpacked.</p>
<p>Building of Hotspot Gtest suite requires the source code of Google <p>Building of Hotspot Gtest suite requires the source code of Google
Test framework. The top directory, which contains both Test framework. The top directory, which contains both
<code>googletest</code> and <code>googlemock</code> directories, should <code>googletest</code> and <code>googlemock</code> directories, should
be specified via <code>--with-gtest</code>. The supported version of be specified via <code>--with-gtest</code>. The minimum supported
Google Test is 1.8.1, whose source code can be obtained:</p> version of Google Test is 1.13.0, whose source code can be obtained:</p>
<ul> <ul>
<li>by downloading and unpacking the source bundle from <a <li>by downloading and unpacking the source bundle from <a
href="https://github.com/google/googletest/releases/tag/release-1.8.1">here</a></li> href="https://github.com/google/googletest/releases/tag/v1.13.0">here</a></li>
<li>or by checking out <code>release-1.8.1</code> tag of <li>or by checking out <code>v1.13.0</code> tag of
<code>googletest</code> project: <code>googletest</code> project:
<code>git clone -b release-1.8.1 https://github.com/google/googletest</code></li> <code>git clone -b v1.13.0 https://github.com/google/googletest</code></li>
</ul> </ul>
<p>To execute the most basic tests (tier 1), use:</p> <p>To execute the most basic tests (tier 1), use:</p>
<pre><code>make run-test-tier1</code></pre> <pre><code>make run-test-tier1</code></pre>

13
doc/building.md
View File

@ -864,13 +864,14 @@ https://ci.adoptopenjdk.net/view/Dependencies/job/dependency_pipeline/lastSucces
Download the latest `.tar.gz` file, unpack it, and point `--with-jtreg` to the Download the latest `.tar.gz` file, unpack it, and point `--with-jtreg` to the
`jtreg` directory that you just unpacked. `jtreg` directory that you just unpacked.
Building of Hotspot Gtest suite requires the source code of Google Test framework. Building of Hotspot Gtest suite requires the source code of Google
The top directory, which contains both `googletest` and `googlemock` Test framework. The top directory, which contains both `googletest`
directories, should be specified via `--with-gtest`. and `googlemock` directories, should be specified via `--with-gtest`.
The supported version of Google Test is 1.8.1, whose source code can be obtained: The minimum supported version of Google Test is 1.13.0, whose source
code can be obtained:
* by downloading and unpacking the source bundle from [here](https://github.com/google/googletest/releases/tag/release-1.8.1) * by downloading and unpacking the source bundle from [here](https://github.com/google/googletest/releases/tag/v1.13.0)
* or by checking out `release-1.8.1` tag of `googletest` project: `git clone -b release-1.8.1 https://github.com/google/googletest` * or by checking out `v1.13.0` tag of `googletest` project: `git clone -b v1.13.0 https://github.com/google/googletest`
To execute the most basic tests (tier 1), use: To execute the most basic tests (tier 1), use:
``` ```

24
make/autoconf/lib-tests.m4
View File

@ -27,8 +27,9 @@
# Setup libraries and functionalities needed to test the JDK. # Setup libraries and functionalities needed to test the JDK.
################################################################################ ################################################################################
# Minimum supported version # Minimum supported versions
JTREG_MINIMUM_VERSION=7.1.1 JTREG_MINIMUM_VERSION=7.1.1
GTEST_MINIMUM_VERSION=1.13.0
############################################################################### ###############################################################################
# #
@ -58,20 +59,13 @@ AC_DEFUN_ONCE([LIB_TESTS_SETUP_GTEST],
AC_MSG_RESULT([$GTEST_FRAMEWORK_SRC]) AC_MSG_RESULT([$GTEST_FRAMEWORK_SRC])
UTIL_FIXUP_PATH([GTEST_FRAMEWORK_SRC]) UTIL_FIXUP_PATH([GTEST_FRAMEWORK_SRC])
# Try to verify version. We require 1.8.1, but this can not be directly # Verify that the version is the required one.
# determined. :-( Instead, there are different, incorrect version # This is a simplified version of TOOLCHAIN_CHECK_COMPILER_VERSION
# numbers we can look for. gtest_version="`$GREP GOOGLETEST_VERSION $GTEST_FRAMEWORK_SRC/CMakeLists.txt | $SED -E -e 's/set\(GOOGLETEST_VERSION (.*)\)/\1/'`"
GTEST_VERSION_1="`$GREP GOOGLETEST_VERSION $GTEST_FRAMEWORK_SRC/CMakeLists.txt | $SED -E -e 's/set\(GOOGLETEST_VERSION (.*)\)/\1/'`" comparable_actual_version=`$AWK -F. '{ printf("%05d%05d%05d%05d\n", [$]1, [$]2, [$]3, [$]4) }' <<< "$gtest_version"`
if test "x$GTEST_VERSION_1" != "x1.9.0"; then comparable_minimum_version=`$AWK -F. '{ printf("%05d%05d%05d%05d\n", [$]1, [$]2, [$]3, [$]4) }' <<< "$GTEST_MINIMUM_VERSION"`
AC_MSG_ERROR([gtest at $GTEST_FRAMEWORK_SRC does not seem to be version 1.8.1]) if test $comparable_actual_version -lt $comparable_minimum_version ; then
fi AC_MSG_ERROR([gtest version is too old, at least version $GTEST_MINIMUM_VERSION is required])
# We cannot grep for "AC_IN*T" as a literal since then m4 will treat it as a macro
# and expand it.
# Additional [] needed to keep m4 from mangling shell constructs.
[ GTEST_VERSION_2="`$GREP -A1 ^.C_INIT $GTEST_FRAMEWORK_SRC/configure.ac | $TAIL -n 1 | $SED -E -e 's/ +\[(.*)],/\1/'`" ]
if test "x$GTEST_VERSION_2" != "x1.8.0"; then
AC_MSG_ERROR([gtest at $GTEST_FRAMEWORK_SRC does not seem to be version 1.8.1 B])
fi fi
fi fi
fi fi

4
make/conf/github-actions.conf
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -25,7 +25,7 @@
# Versions and download locations for dependencies used by GitHub Actions (GHA) # Versions and download locations for dependencies used by GitHub Actions (GHA)
GTEST_VERSION=1.8.1 GTEST_VERSION=1.13.0
JTREG_VERSION=7.1.1+1 JTREG_VERSION=7.1.1+1
LINUX_X64_BOOT_JDK_EXT=tar.gz LINUX_X64_BOOT_JDK_EXT=tar.gz

2
make/conf/jib-profiles.js
View File

@ -1236,7 +1236,7 @@ var getJibProfilesDependencies = function (input, common) {
gtest: { gtest: {
organization: common.organization, organization: common.organization,
ext: "tar.gz", ext: "tar.gz",
revision: "1.8.1" revision: "1.13.0+1.0"
}, },
}; };

4
test/hotspot/gtest/gtestMain.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -230,7 +230,7 @@ static void runUnitTestsInner(int argc, char** argv) {
bool is_vmassert_test = false; bool is_vmassert_test = false;
bool is_othervm_test = false; bool is_othervm_test = false;
// death tests facility is used for both regular death tests, other vm and vmassert tests // death tests facility is used for both regular death tests, other vm and vmassert tests
if (::testing::internal::GTEST_FLAG(internal_run_death_test).length() > 0) { if (::testing::GTEST_FLAG(internal_run_death_test).length() > 0) {
// when we execute death test, filter value equals to test name // when we execute death test, filter value equals to test name
const char* test_name = ::testing::GTEST_FLAG(filter).c_str(); const char* test_name = ::testing::GTEST_FLAG(filter).c_str();
const char* const othervm_suffix = "_other_vm"; // TEST_OTHER_VM const char* const othervm_suffix = "_other_vm"; // TEST_OTHER_VM