Skip to content

Commit

Permalink
Migrate from googletest 1.8 to googletest 1.10 (#67)
Browse files Browse the repository at this point in the history
Summary:
X-link: facebookincubator/hsthrift#67

Updating `googletest` from `1.8.0` to `1.10.0`

Reviewed By: mzlee, igorsugak, luciang, meyering, r-barnes

Differential Revision: D34351084

fbshipit-source-id: 939b3985ab63a06b6d511ec8711c2d5863bdfea8
  • Loading branch information
dimitribouche authored and facebook-github-bot committed Mar 3, 2022
1 parent 11ffe17 commit 715dec8
Show file tree
Hide file tree
Showing 35 changed files with 551 additions and 780 deletions.
2 changes: 1 addition & 1 deletion build/fbcode_builder/manifests/mvfst
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ folly
fizz

[dependencies.all(test=on, not(os=windows))]
googletest_1_8
googletest

[shipit.pathmap]
fbcode/quic/public_root = .
Expand Down
2 changes: 1 addition & 1 deletion build/fbcode_builder/manifests/proxygen
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ wangle
mvfst

[dependencies.test=on]
googletest_1_8
googletest

[shipit.pathmap]
fbcode/proxygen/public_tld = .
Expand Down
2 changes: 1 addition & 1 deletion build_helper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ function setup_googletest() {
fi
cd "$GTEST_DIR"
git fetch --tags
git checkout release-1.8.0
git checkout release-1.10.0
echo -e "${COLOR_GREEN}Building googletest ${COLOR_OFF}"
mkdir -p "$GTEST_BUILD_DIR"
cd "$GTEST_BUILD_DIR" || exit
Expand Down
4 changes: 2 additions & 2 deletions cmake/QuicTest.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
include(CTest)

if(BUILD_TESTS)
find_package(GMock 1.8.0 MODULE REQUIRED)
find_package(GTest 1.8.0 MODULE REQUIRED)
find_package(GMock 1.10.0 MODULE REQUIRED)
find_package(GTest 1.10.0 MODULE REQUIRED)
endif()

function(quic_add_test)
Expand Down
Loading

0 comments on commit 715dec8

Please sign in to comment.