diff --git a/cmake-modules/AddGoogleTest.cmake b/cmake-modules/AddGoogleTest.cmake index d273d565b..cba7cd94e 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.11.0 + GIT_TAG release-1.12.1 UPDATE_DISCONNECTED 1 QUIET ) @@ -29,7 +29,7 @@ else() FetchContent_Declare( googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG release-1.11.0 + GIT_TAG release-1.12.1 ) FetchContent_GetProperties(googletest) if(NOT googletest_POPULATED) diff --git a/eng/pipelines/templates/jobs/cmake-generate-jobs.yml b/eng/pipelines/templates/jobs/cmake-generate-jobs.yml index 866610875..7630de421 100644 --- a/eng/pipelines/templates/jobs/cmake-generate-jobs.yml +++ b/eng/pipelines/templates/jobs/cmake-generate-jobs.yml @@ -14,6 +14,9 @@ parameters: - name: CMakeSourceTestOptions type: object default: [] + - name: TimeoutInMinutes + type: number + default: 120 jobs: - template: /eng/common/pipelines/templates/jobs/archetype-sdk-tests-generate.yml diff --git a/eng/pipelines/templates/jobs/cmake-generate.tests.yml b/eng/pipelines/templates/jobs/cmake-generate.tests.yml index cbf285a18..d2be6f47e 100644 --- a/eng/pipelines/templates/jobs/cmake-generate.tests.yml +++ b/eng/pipelines/templates/jobs/cmake-generate.tests.yml @@ -28,9 +28,13 @@ parameters: - name: JobName type: string default: CMakeGenerate + - name: TimeoutInMinutes + type: number + default: 120 jobs: - job: ${{ parameters.JobName }} + timeoutInMinutes: ${{ parameters.TimeoutInMinutes }} condition: >- and( succeededOrFailed(), diff --git a/eng/pipelines/templates/stages/archetype-sdk-client.yml b/eng/pipelines/templates/stages/archetype-sdk-client.yml index 6a86decd0..36a1ddd4d 100644 --- a/eng/pipelines/templates/stages/archetype-sdk-client.yml +++ b/eng/pipelines/templates/stages/archetype-sdk-client.yml @@ -73,13 +73,16 @@ parameters: - name: PostTestSteps type: stepList default: [] - +- name: CMakeGenerationTimeoutInMinutes + type: number + default: 120 stages: - stage: CMakeGeneration jobs: - template: /eng/pipelines/templates/jobs/cmake-generate-jobs.yml parameters: + TimeoutInMinutes: ${{ parameters.CMakeGenerationTimeoutInMinutes }} ServiceDirectory: ${{ parameters.ServiceDirectory }} Artifacts: ${{ parameters.Artifacts }} ArtifactsSource: ${{ parameters.ArtifactsSource }} diff --git a/sdk/attestation/azure-security-attestation/test/ut/CMakeLists.txt b/sdk/attestation/azure-security-attestation/test/ut/CMakeLists.txt index b0ebdab0f..37a46505a 100644 --- a/sdk/attestation/azure-security-attestation/test/ut/CMakeLists.txt +++ b/sdk/attestation/azure-security-attestation/test/ut/CMakeLists.txt @@ -37,4 +37,6 @@ create_map_file(azure-security-attestation-test azure-security-attestation-test. target_link_libraries(azure-security-attestation-test PRIVATE Azure::azure-security-attestation azure-identity azure-core-test-fw gtest_main) -gtest_discover_tests(azure-security-attestation-test TEST_PREFIX azure-security-attestation.) +gtest_discover_tests(azure-security-attestation-test + DISCOVERY_TIMEOUT 600 + TEST_PREFIX azure-security-attestation.) diff --git a/sdk/core/azure-core-tracing-opentelemetry/test/ut/CMakeLists.txt b/sdk/core/azure-core-tracing-opentelemetry/test/ut/CMakeLists.txt index a73d7272d..5496d16bf 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/test/ut/CMakeLists.txt +++ b/sdk/core/azure-core-tracing-opentelemetry/test/ut/CMakeLists.txt @@ -67,4 +67,5 @@ create_map_file(azure-core-tracing-opentelemetry-test azure-core-tracing-opentel gtest_discover_tests(azure-core-tracing-opentelemetry-test TEST_PREFIX azure-core-tracing-opentelemetry. NO_PRETTY_TYPES - NO_PRETTY_VALUES) + NO_PRETTY_VALUES + DISCOVERY_TIMEOUT 600) diff --git a/sdk/core/azure-core/cgmanifest.json b/sdk/core/azure-core/cgmanifest.json index e2a629c88..5573018d3 100644 --- a/sdk/core/azure-core/cgmanifest.json +++ b/sdk/core/azure-core/cgmanifest.json @@ -46,7 +46,7 @@ "Type": "git", "git": { "RepositoryUrl": "https://github.com/google/googletest", - "CommitHash": "e2239ee6043f73722e7aa812a459f54a28552929" + "CommitHash": "58d77fa8070e8cec2dc1ed015d66b454c8d78850" } }, "DevelopmentDependency": true diff --git a/sdk/core/azure-core/test/ut/CMakeLists.txt b/sdk/core/azure-core/test/ut/CMakeLists.txt index 540d692e1..867227d9e 100644 --- a/sdk/core/azure-core/test/ut/CMakeLists.txt +++ b/sdk/core/azure-core/test/ut/CMakeLists.txt @@ -150,7 +150,8 @@ target_link_libraries(azure-core-global-context-test PRIVATE azure-core gtest_ma gtest_discover_tests(azure-core-test TEST_PREFIX azure-core. NO_PRETTY_TYPES - NO_PRETTY_VALUES) + NO_PRETTY_VALUES + DISCOVERY_TIMEOUT 600) if(BUILD_TRANSPORT_CURL) ################## Azure Libcurl Core Test ################################# @@ -177,10 +178,12 @@ if(BUILD_TRANSPORT_CURL) # Use the same prefix to run this test gtest_discover_tests(azure-core-libcurl-test - TEST_PREFIX azure-core.) + TEST_PREFIX azure-core. + DISCOVERY_TIMEOUT 600) endif() gtest_discover_tests(azure-core-global-context-test TEST_PREFIX azure-core. NO_PRETTY_TYPES - NO_PRETTY_VALUES) + NO_PRETTY_VALUES + DISCOVERY_TIMEOUT 600) diff --git a/sdk/core/perf/test/CMakeLists.txt b/sdk/core/perf/test/CMakeLists.txt index b06bbb313..4ce7e46c2 100644 --- a/sdk/core/perf/test/CMakeLists.txt +++ b/sdk/core/perf/test/CMakeLists.txt @@ -70,5 +70,6 @@ target_link_libraries(azure-perf-unit-test PRIVATE azure-perf gtest gtest_main) gtest_discover_tests(azure-perf-unit-test TEST_PREFIX azure-perf-unittest. NO_PRETTY_TYPES - NO_PRETTY_VALUES) + NO_PRETTY_VALUES + DISCOVERY_TIMEOUT 600) diff --git a/sdk/identity/azure-identity/test/ut/CMakeLists.txt b/sdk/identity/azure-identity/test/ut/CMakeLists.txt index 243f4d567..2b85e8216 100644 --- a/sdk/identity/azure-identity/test/ut/CMakeLists.txt +++ b/sdk/identity/azure-identity/test/ut/CMakeLists.txt @@ -59,4 +59,5 @@ target_link_libraries(azure-identity-test PRIVATE azure-identity azure-core-test gtest_discover_tests(azure-identity-test TEST_PREFIX azure-identity. NO_PRETTY_TYPES - NO_PRETTY_VALUES) + NO_PRETTY_VALUES + DISCOVERY_TIMEOUT 600) diff --git a/sdk/keyvault/azure-security-keyvault-certificates/test/ut/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-certificates/test/ut/CMakeLists.txt index 3a2272f47..20a567863 100644 --- a/sdk/keyvault/azure-security-keyvault-certificates/test/ut/CMakeLists.txt +++ b/sdk/keyvault/azure-security-keyvault-certificates/test/ut/CMakeLists.txt @@ -37,4 +37,4 @@ gtest_discover_tests(azure-security-keyvault-certificates-test TEST_PREFIX azure-security-keyvault-certificates. NO_PRETTY_TYPES NO_PRETTY_VALUES -) + DISCOVERY_TIMEOUT 600) diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-keys/test/ut/CMakeLists.txt index e62e8ec3f..1acc71819 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/test/ut/CMakeLists.txt +++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut/CMakeLists.txt @@ -62,4 +62,4 @@ gtest_discover_tests(azure-security-keyvault-keys-test TEST_PREFIX azure-security-keyvault-keys. NO_PRETTY_TYPES NO_PRETTY_VALUES -) + DISCOVERY_TIMEOUT 600) diff --git a/sdk/keyvault/azure-security-keyvault-secrets/test/ut/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-secrets/test/ut/CMakeLists.txt index e7e76e49a..146720e94 100644 --- a/sdk/keyvault/azure-security-keyvault-secrets/test/ut/CMakeLists.txt +++ b/sdk/keyvault/azure-security-keyvault-secrets/test/ut/CMakeLists.txt @@ -44,4 +44,4 @@ gtest_discover_tests(azure-security-keyvault-secrets-test TEST_PREFIX azure-security-keyvault-secrets-unittest. NO_PRETTY_TYPES NO_PRETTY_VALUES -) + DISCOVERY_TIMEOUT 600) diff --git a/sdk/storage/azure-storage-blobs/test/ut/CMakeLists.txt b/sdk/storage/azure-storage-blobs/test/ut/CMakeLists.txt index 15c0dd0c3..0b21c02a4 100644 --- a/sdk/storage/azure-storage-blobs/test/ut/CMakeLists.txt +++ b/sdk/storage/azure-storage-blobs/test/ut/CMakeLists.txt @@ -48,4 +48,5 @@ target_link_libraries(azure-storage-blobs-test PRIVATE azure-identity azure-stor gtest_discover_tests(azure-storage-blobs-test TEST_PREFIX azure-storage-blobs. NO_PRETTY_TYPES - NO_PRETTY_VALUES) + NO_PRETTY_VALUES + DISCOVERY_TIMEOUT 600) diff --git a/sdk/storage/azure-storage-common/test/ut/CMakeLists.txt b/sdk/storage/azure-storage-common/test/ut/CMakeLists.txt index 05e85b568..3e3ef7435 100644 --- a/sdk/storage/azure-storage-common/test/ut/CMakeLists.txt +++ b/sdk/storage/azure-storage-common/test/ut/CMakeLists.txt @@ -40,4 +40,5 @@ target_link_libraries(azure-storage-common-test PRIVATE azure-storage-common azu gtest_discover_tests(azure-storage-common-test TEST_PREFIX azure-storage-common. NO_PRETTY_TYPES - NO_PRETTY_VALUES) + NO_PRETTY_VALUES + DISCOVERY_TIMEOUT 600) diff --git a/sdk/storage/azure-storage-files-datalake/test/ut/CMakeLists.txt b/sdk/storage/azure-storage-files-datalake/test/ut/CMakeLists.txt index ea2c7d2fd..13dce96db 100644 --- a/sdk/storage/azure-storage-files-datalake/test/ut/CMakeLists.txt +++ b/sdk/storage/azure-storage-files-datalake/test/ut/CMakeLists.txt @@ -44,4 +44,5 @@ target_link_libraries(azure-storage-files-datalake-test PRIVATE azure-storage-fi gtest_discover_tests(azure-storage-files-datalake-test TEST_PREFIX azure-storage-files-datalake. NO_PRETTY_TYPES - NO_PRETTY_VALUES) + NO_PRETTY_VALUES + DISCOVERY_TIMEOUT 600) diff --git a/sdk/storage/azure-storage-files-shares/test/ut/CMakeLists.txt b/sdk/storage/azure-storage-files-shares/test/ut/CMakeLists.txt index 9221ad5f2..7b2c33e4b 100644 --- a/sdk/storage/azure-storage-files-shares/test/ut/CMakeLists.txt +++ b/sdk/storage/azure-storage-files-shares/test/ut/CMakeLists.txt @@ -42,4 +42,5 @@ target_link_libraries(azure-storage-files-shares-test PRIVATE azure-storage-file gtest_discover_tests(azure-storage-files-shares-test TEST_PREFIX azure-storage-files-shares. NO_PRETTY_TYPES - NO_PRETTY_VALUES) + NO_PRETTY_VALUES + DISCOVERY_TIMEOUT 600) diff --git a/sdk/storage/azure-storage-queues/test/ut/CMakeLists.txt b/sdk/storage/azure-storage-queues/test/ut/CMakeLists.txt index d4e7b89ed..301dd9d4b 100644 --- a/sdk/storage/azure-storage-queues/test/ut/CMakeLists.txt +++ b/sdk/storage/azure-storage-queues/test/ut/CMakeLists.txt @@ -37,4 +37,5 @@ target_link_libraries(azure-storage-queues-test PRIVATE azure-storage-queues azu gtest_discover_tests(azure-storage-queues-test TEST_PREFIX azure-storage-queues. NO_PRETTY_TYPES - NO_PRETTY_VALUES) + NO_PRETTY_VALUES + DISCOVERY_TIMEOUT 600) diff --git a/sdk/template/azure-template/test/CMakeLists.txt b/sdk/template/azure-template/test/CMakeLists.txt index ce6ff435c..90ba1175f 100644 --- a/sdk/template/azure-template/test/CMakeLists.txt +++ b/sdk/template/azure-template/test/CMakeLists.txt @@ -25,4 +25,6 @@ if (MSVC) target_compile_options(azure-template-test PUBLIC /wd6326 /wd26495 /wd26812) endif() -gtest_discover_tests(azure-template-test TEST_PREFIX azure-template.) +gtest_discover_tests(azure-template-test + TEST_PREFIX azure-template. + DISCOVERY_TIMEOUT 600)