From 74576d640f94ca4ebbc9ae26387fab960bcd5762 Mon Sep 17 00:00:00 2001 From: Victor Vazquez Date: Thu, 17 Feb 2022 13:41:04 -0800 Subject: [PATCH] Increment gTest version to get rid of warning during cmake-configure (#3351) * increase version * update manifest * fix test --- cmake-modules/AddGoogleTest.cmake | 4 +- sdk/core/azure-core/cgmanifest.json | 42 +++++++++---------- .../test/ut/share_file_client_test.cpp | 4 +- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/cmake-modules/AddGoogleTest.cmake b/cmake-modules/AddGoogleTest.cmake index fea387ee3..508a867a1 100644 --- a/cmake-modules/AddGoogleTest.cmake +++ b/cmake-modules/AddGoogleTest.cmake @@ -15,7 +15,7 @@ if(CMAKE_VERSION VERSION_LESS 3.11) download_project( PROJ googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG release-1.10.0 + GIT_TAG release-1.11.0 UPDATE_DISCONNECTED 1 QUIET ) @@ -29,7 +29,7 @@ else() FetchContent_Declare( googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG release-1.10.0 + GIT_TAG release-1.11.0 ) FetchContent_GetProperties(googletest) if(NOT googletest_POPULATED) diff --git a/sdk/core/azure-core/cgmanifest.json b/sdk/core/azure-core/cgmanifest.json index 934de9a89..781d6210c 100644 --- a/sdk/core/azure-core/cgmanifest.json +++ b/sdk/core/azure-core/cgmanifest.json @@ -12,11 +12,11 @@ }, { "Component": { - "Type": "git", - "git": { - "RepositoryUrl": "https://github.com/nlohmann/json", - "CommitHash": "db78ac1d7716f56fc9f1b030b715f872f93964e4" - } + "Type": "git", + "git": { + "RepositoryUrl": "https://github.com/nlohmann/json", + "CommitHash": "db78ac1d7716f56fc9f1b030b715f872f93964e4" + } }, "DevelopmentDependency": false }, @@ -25,7 +25,7 @@ "Type": "git", "git": { "RepositoryUrl": "https://github.com/google/googletest", - "CommitHash": "703bd9caab50b139428cea1aaff9974ebee5742e" + "CommitHash": "e2239ee6043f73722e7aa812a459f54a28552929" } }, "DevelopmentDependency": true @@ -54,24 +54,24 @@ }, { "Component": { - "Type": "git", - "git": { - "RepositoryUrl": "https://github.com/CLIUtils/cmake", - "CommitHash": "4e52e4d0bc2e9fd27171926d0b5d9f396dd8637c" - } + "Type": "git", + "git": { + "RepositoryUrl": "https://github.com/CLIUtils/cmake", + "CommitHash": "4e52e4d0bc2e9fd27171926d0b5d9f396dd8637c" + } }, "DevelopmentDependency": true }, { - "Component": { - "Type": "other", - "Other": { - "Name": "gcovr", - "Version": "3.4-1", - "DownloadUrl": "https://ubuntu.pkgs.org/18.04/ubuntu-universe-amd64/gcovr_3.4-1_all.deb.html" - } - }, - "DevelopmentDependency": true + "Component": { + "Type": "other", + "Other": { + "Name": "gcovr", + "Version": "3.4-1", + "DownloadUrl": "https://ubuntu.pkgs.org/18.04/ubuntu-universe-amd64/gcovr_3.4-1_all.deb.html" + } + }, + "DevelopmentDependency": true }, { "Component": { @@ -84,4 +84,4 @@ "DevelopmentDependency": true } ] -} +} \ No newline at end of file diff --git a/sdk/storage/azure-storage-files-shares/test/ut/share_file_client_test.cpp b/sdk/storage/azure-storage-files-shares/test/ut/share_file_client_test.cpp index 2281c79eb..7f45637c2 100644 --- a/sdk/storage/azure-storage-files-shares/test/ut/share_file_client_test.cpp +++ b/sdk/storage/azure-storage-files-shares/test/ut/share_file_client_test.cpp @@ -530,7 +530,7 @@ namespace Azure { namespace Storage { namespace Test { TEST_P(DowloadShare, fromBuffer) { - auto const p = GetParam(); + ShareConcurrentDownloadParameter const& p(GetParam()); m_fileContent = std::vector(static_cast(8_MB), 'x'); m_fileClient->UploadFrom(m_fileContent.data(), m_fileContent.size()); @@ -605,7 +605,7 @@ namespace Azure { namespace Storage { namespace Test { TEST_P(DowloadShare, fromFile) { - auto const p = GetParam(); + ShareConcurrentDownloadParameter const& p(GetParam()); m_fileContent = std::vector(static_cast(8_MB), 'x'); m_fileClient->UploadFrom(m_fileContent.data(), m_fileContent.size());