Skip to content

Change Git tag of googletest to the 1.11.0 release. #676

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

Merged
merged 4 commits into from
Oct 6, 2021
Merged

Change Git tag of googletest to the 1.11.0 release. #676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
115cc7d
Change Git tag of googletest to the 1.11.0 release.
jonsimantov Sep 23, 2021
e8c184f
Add comment explaining GoogleTest version.
jonsimantov Sep 28, 2021
f6dcae3
Merge branch 'main' into bugfix/pin-googletest
jonsimantov Sep 28, 2021
88a792e
Merge branch 'main' into bugfix/pin-googletest
jonsimantov Oct 5, 2021
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
3 changes: 2 additions & 1 deletion admob/integration_test/googletest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# limitations under the License.

# Download GoogleTest from GitHub as an external project.
# Pin to 1.11.0 because we touch internal GoogleTest structures that could change in the future.

# This CMake file is taken from:
# https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project
Expand All @@ -24,7 +25,7 @@ project(googletest-download NONE)
include(ExternalProject)
ExternalProject_Add(googletest
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG master
GIT_TAG "release-1.11.0"
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/src"
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/build"
CONFIGURE_COMMAND ""
Expand Down
3 changes: 2 additions & 1 deletion analytics/integration_test/googletest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# limitations under the License.

# Download GoogleTest from GitHub as an external project.
# Pin to 1.11.0 because we touch internal GoogleTest structures that could change in the future.

# This CMake file is taken from:
# https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project
Expand All @@ -24,7 +25,7 @@ project(googletest-download NONE)
include(ExternalProject)
ExternalProject_Add(googletest
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG master
GIT_TAG "release-1.11.0"
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/src"
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/build"
CONFIGURE_COMMAND ""
Expand Down
3 changes: 2 additions & 1 deletion app/integration_test/googletest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# limitations under the License.

# Download GoogleTest from GitHub as an external project.
# Pin to 1.11.0 because we touch internal GoogleTest structures that could change in the future.

# This CMake file is taken from:
# https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project
Expand All @@ -24,7 +25,7 @@ project(googletest-download NONE)
include(ExternalProject)
ExternalProject_Add(googletest
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG master
GIT_TAG "release-1.11.0"
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/src"
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/build"
CONFIGURE_COMMAND ""
Expand Down
3 changes: 2 additions & 1 deletion auth/integration_test/googletest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# limitations under the License.

# Download GoogleTest from GitHub as an external project.
# Pin to 1.11.0 because we touch internal GoogleTest structures that could change in the future.

# This CMake file is taken from:
# https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project
Expand All @@ -24,7 +25,7 @@ project(googletest-download NONE)
include(ExternalProject)
ExternalProject_Add(googletest
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG master
GIT_TAG "release-1.11.0"
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/src"
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/build"
CONFIGURE_COMMAND ""
Expand Down
3 changes: 2 additions & 1 deletion database/integration_test/googletest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# limitations under the License.

# Download GoogleTest from GitHub as an external project.
# Pin to 1.11.0 because we touch internal GoogleTest structures that could change in the future.

# This CMake file is taken from:
# https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project
Expand All @@ -24,7 +25,7 @@ project(googletest-download NONE)
include(ExternalProject)
ExternalProject_Add(googletest
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG master
GIT_TAG "release-1.11.0"
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/src"
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/build"
CONFIGURE_COMMAND ""
Expand Down
3 changes: 2 additions & 1 deletion dynamic_links/integration_test/googletest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# limitations under the License.

# Download GoogleTest from GitHub as an external project.
# Pin to 1.11.0 because we touch internal GoogleTest structures that could change in the future.

# This CMake file is taken from:
# https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project
Expand All @@ -24,7 +25,7 @@ project(googletest-download NONE)
include(ExternalProject)
ExternalProject_Add(googletest
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG master
GIT_TAG "release-1.11.0"
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/src"
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/build"
CONFIGURE_COMMAND ""
Expand Down
3 changes: 2 additions & 1 deletion firestore/integration_test/googletest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# limitations under the License.

# Download GoogleTest from GitHub as an external project.
# Pin to 1.11.0 because we touch internal GoogleTest structures that could change in the future.

# This CMake file is taken from:
# https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project
Expand All @@ -24,7 +25,7 @@ project(googletest-download NONE)
include(ExternalProject)
ExternalProject_Add(googletest
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG master
GIT_TAG "release-1.11.0"
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/src"
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/build"
CONFIGURE_COMMAND ""
Expand Down
3 changes: 2 additions & 1 deletion firestore/integration_test_internal/googletest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# limitations under the License.

# Download GoogleTest from GitHub as an external project.
# Pin to 1.11.0 because we touch internal GoogleTest structures that could change in the future.

# This CMake file is taken from:
# https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project
Expand All @@ -24,7 +25,7 @@ project(googletest-download NONE)
include(ExternalProject)
ExternalProject_Add(googletest
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG master
GIT_TAG "release-1.11.0"
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/src"
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/build"
CONFIGURE_COMMAND ""
Expand Down
3 changes: 2 additions & 1 deletion functions/integration_test/googletest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# limitations under the License.

# Download GoogleTest from GitHub as an external project.
# Pin to 1.11.0 because we touch internal GoogleTest structures that could change in the future.

# This CMake file is taken from:
# https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project
Expand All @@ -24,7 +25,7 @@ project(googletest-download NONE)
include(ExternalProject)
ExternalProject_Add(googletest
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG master
GIT_TAG "release-1.11.0"
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/src"
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/build"
CONFIGURE_COMMAND ""
Expand Down
3 changes: 2 additions & 1 deletion installations/integration_test/googletest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# limitations under the License.

# Download GoogleTest from GitHub as an external project.
# Pin to 1.11.0 because we touch internal GoogleTest structures that could change in the future.

# This CMake file is taken from:
# https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project
Expand All @@ -24,7 +25,7 @@ project(googletest-download NONE)
include(ExternalProject)
ExternalProject_Add(googletest
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG master
GIT_TAG "release-1.11.0"
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/src"
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/build"
CONFIGURE_COMMAND ""
Expand Down
3 changes: 2 additions & 1 deletion messaging/integration_test/googletest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# limitations under the License.

# Download GoogleTest from GitHub as an external project.
# Pin to 1.11.0 because we touch internal GoogleTest structures that could change in the future.

# This CMake file is taken from:
# https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project
Expand All @@ -24,7 +25,7 @@ project(googletest-download NONE)
include(ExternalProject)
ExternalProject_Add(googletest
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG master
GIT_TAG "release-1.11.0"
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/src"
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/build"
CONFIGURE_COMMAND ""
Expand Down
3 changes: 2 additions & 1 deletion remote_config/integration_test/googletest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# limitations under the License.

# Download GoogleTest from GitHub as an external project.
# Pin to 1.11.0 because we touch internal GoogleTest structures that could change in the future.

# This CMake file is taken from:
# https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project
Expand All @@ -24,7 +25,7 @@ project(googletest-download NONE)
include(ExternalProject)
ExternalProject_Add(googletest
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG master
GIT_TAG "release-1.11.0"
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/src"
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/build"
CONFIGURE_COMMAND ""
Expand Down
3 changes: 2 additions & 1 deletion storage/integration_test/googletest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# limitations under the License.

# Download GoogleTest from GitHub as an external project.
# Pin to 1.11.0 because we touch internal GoogleTest structures that could change in the future.

# This CMake file is taken from:
# https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project
Expand All @@ -24,7 +25,7 @@ project(googletest-download NONE)
include(ExternalProject)
ExternalProject_Add(googletest
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG master
GIT_TAG "release-1.11.0"
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/src"
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/build"
CONFIGURE_COMMAND ""
Expand Down
1 change: 1 addition & 0 deletions testing/test_framework/download_googletest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
SRC_DIR = os.path.relpath(os.path.dirname(__file__))
TAG = os.path.basename(__file__)

# Pin to 1.11.0 because we touch internal GoogleTest structures that could change in the future.
GOOGLETEST_ZIP = 'https://github.com/google/googletest/archive/refs/tags/release-1.11.0.zip'
# Top-level directory inside the zip file to ignore.
GOOGLETEST_DIR = os.path.join('googletest-release-1.11.0')
Expand Down