-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Build dev 1.10 pr11 #2028
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.
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
Build dev 1.10 pr11 #2028
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| /** | ||
| * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| * SPDX-License-Identifier: Apache-2.0. | ||
| */ | ||
|
|
||
| #cmakedefine USE_AWS_MEMORY_MANAGEMENT | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule aws-crt-cpp
deleted from
3e55d5
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| add_executable( | ||
| aws-core-monitoring | ||
| ${CMAKE_CURRENT_LIST_DIR}/MonitoringEndToEndTest.cpp | ||
| ${CMAKE_CURRENT_LIST_DIR}/MonitoringTest.cpp | ||
| ) | ||
| target_include_directories( | ||
| aws-core-monitoring | ||
| PRIVATE GTest::GTest | ||
| ) | ||
| target_link_libraries( | ||
| aws-core-monitoring | ||
| PRIVATE GTest::GTest | ||
| PRIVATE aws-sdk-cpp::core | ||
| ) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
134 changes: 134 additions & 0 deletions
134
src/aws-cpp-sdk-core-tests/testing-resources/CMakeLists.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| # SPDX-License-Identifier: Apache-2.0. | ||
| # | ||
| if (NOT LEGACY_BUILD) | ||
| add_subdirectory(include) | ||
| add_subdirectory(source) | ||
| else() | ||
| add_project(testing-resources | ||
| "Testing utility library for the AWS C++ SDK" | ||
| aws-cpp-sdk-core) | ||
|
|
||
| include(GenerateExportHeader) | ||
|
|
||
| file(GLOB AWS_TESTING_HEADERS "include/aws/testing/*.h") | ||
| file(GLOB AWS_TESTING_EXTERNAL_HEADERS "include/aws/external/*.h") | ||
| file(GLOB AWS_TESTING_AUTH_MOCKS_HEADERS "include/aws/testing/mocks/aws/auth/*.h") | ||
| file(GLOB AWS_TESTING_EVENT_MOCKS_HEADERS "include/aws/testing/mocks/event/*.h") | ||
| file(GLOB AWS_TESTING_HTTP_MOCKS_HEADERS "include/aws/testing/mocks/http/*.h") | ||
| file(GLOB AWS_TESTING_CLIENT_MOCKS_HEADERS "include/aws/testing/mocks/aws/client/*.h") | ||
| file(GLOB AWS_TESTING_MONITORING_MOCKS_HEADERS "include/aws/testing/mocks/monitoring/*.h") | ||
| file(GLOB AWS_TESTING_PLATFORM_HEADERS "include/aws/testing/platform/*.h") | ||
|
|
||
| file(GLOB AWS_TESTING_SOURCE "source/*.cpp") | ||
| file(GLOB AWS_TESTING_EXTERNAL_SOURCE "source/external/*.cc") | ||
|
|
||
| file(GLOB TestingResources_SHARED_SRC | ||
| ${AWS_TESTING_HEADERS} | ||
| ${AWS_TESTING_EXTERNAL_HEADERS} | ||
| ${AWS_TESTING_AUTH_MOCKS_HEADERS} | ||
| ${AWS_TESTING_EVENT_MOCKS_HEADERS} | ||
| ${AWS_TESTING_HTTP_MOCKS_HEADERS} | ||
| ${AWS_TESTING_CLIENT_MOCKS_HEADERS} | ||
| ${AWS_TESTING_MONITORING_MOCKS_HEADERS} | ||
| ${AWS_TESTING_PLATFORM_HEADERS} | ||
| ${AWS_TESTING_SOURCE} | ||
| ${AWS_TESTING_EXTERNAL_SOURCE} | ||
| ) | ||
|
|
||
| if(PLATFORM_ANDROID) | ||
| file(GLOB AWS_TESTING_PLATFORM_ANDROID_HEADERS "include/aws/testing/platform/android/*.h") | ||
| file(GLOB AWS_TESTING_PLATFORM_ANDROID_SOURCE "source/platform/android/*.cpp") | ||
|
|
||
| file(GLOB TestingResources_PLATFORM_SRC ${AWS_TESTING_ANDROID_HEADERS} ${AWS_TESTING_ANDROID_SOURCE}) | ||
| file(GLOB TestingResources_PLATFORM_SRC ${AWS_TESTING_PLATFORM_ANDROID_HEADERS} ${AWS_TESTING_PLATFORM_ANDROID_SOURCE}) | ||
| elseif(PLATFORM_WINDOWS) | ||
| file(GLOB TestingResources_PLATFORM_SRC "source/platform/windows/*.cpp") | ||
| elseif(PLATFORM_LINUX OR PLATFORM_APPLE) | ||
| file(GLOB TestingResources_PLATFORM_SRC "source/platform/linux-shared/*.cpp") | ||
| elseif(PLATFORM_CUSTOM) | ||
| gather_custom_testing_source(TestingResources_PLATFORM_SRC) | ||
| endif() | ||
|
|
||
| if(PLATFORM_WINDOWS) | ||
| if(MSVC) | ||
| source_group("Header Files\\aws\\testing" FILES ${AWS_TESTING_HEADERS}) | ||
| source_group("Header Files\\aws\\testing\\platform" FILES ${AWS_TESTING_PLATFORM_HEADERS}) | ||
| source_group("Header Files\\aws\\external" FILES ${AWS_TESTING_EXTERNAL_HEADERS}) | ||
| source_group("Header Files\\aws\\testing\\mocks\\aws\\auth" FILES ${AWS_TESTING_AUTH_MOCKS_HEADERS}) | ||
| source_group("Header Files\\aws\\testing\\mocks\\event" FILES ${AWS_TESTING_EVENT_MOCKS_HEADERS}) | ||
| source_group("Header Files\\aws\\testing\\mocks\\http" FILES ${AWS_TESTING_HTTP_MOCKS_HEADERS}) | ||
| source_group("Header Files\\aws\\testing\\mocks\\aws\\client" FILES ${AWS_TESTING_CLIENT_MOCKS_HEADERS}) | ||
| source_group("Header Files\\aws\\testing\\mocks\\monitoring" FILES ${AWS_TESTING_MONITORING_MOCKS_HEADERS}) | ||
| source_group("Source Files" FILES ${AWS_TESTING_SOURCE}) | ||
| source_group("Source Files\\external" FILES ${AWS_TESTING_EXTERNAL_SOURCE}) | ||
| source_group("Source Files\\platform\\windows" FILES ${TestingResources_PLATFORM_SRC}) | ||
| endif(MSVC) | ||
| endif() | ||
|
|
||
| file(GLOB TestingResources_SRC | ||
| ${TestingResources_SHARED_SRC} | ||
| ${TestingResources_PLATFORM_SRC} | ||
| ) | ||
|
|
||
| set(INCLUDES | ||
| "include" | ||
| ) | ||
|
|
||
| if(PLATFORM_CUSTOM) | ||
| if(COMMAND add_custom_core_include_directories) | ||
| add_custom_core_include_directories(CUSTOM_INCLUDE) | ||
| set(INCLUDES ${INCLUDES} ${CUSTOM_INCLUDE}) | ||
| endif() | ||
| if(COMMAND add_custom_definitions) | ||
| add_custom_definitions() | ||
| endif() | ||
| endif() | ||
|
|
||
| include_directories(${INCLUDES}) | ||
|
|
||
| if(USE_WINDOWS_DLL_SEMANTICS AND BUILD_SHARED_LIBS) | ||
| add_definitions(-DAWS_TESTING_EXPORTS=1) | ||
| add_definitions(-DGTEST_CREATE_SHARED_LIBRARY=1) | ||
| endif() | ||
|
|
||
| if(PLATFORM_WINDOWS) | ||
| add_definitions("-DDISABLE_HOME_DIR_REDIRECT") | ||
| endif() | ||
|
|
||
| add_library(${PROJECT_NAME} ${TestingResources_SRC}) | ||
| add_library(AWS::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) | ||
|
|
||
| set_compiler_flags(${PROJECT_NAME}) | ||
| set_compiler_warnings(${PROJECT_NAME}) | ||
|
|
||
| if(PLATFORM_CUSTOM) | ||
| add_custom_testing_target_compile_definitions() | ||
| endif() | ||
|
|
||
| target_include_directories(${PROJECT_NAME} PUBLIC | ||
| $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | ||
| $<INSTALL_INTERFACE:include>) | ||
| target_link_libraries(${PROJECT_NAME} ${PLATFORM_DEP_LIBS} ${PROJECT_LIBS}) | ||
|
|
||
| if(COMMAND add_custom_testing_link_libraries) | ||
| add_custom_testing_link_libraries() | ||
| endif() | ||
|
|
||
| if(COMMAND add_custom_testing_target_compile_definitions) | ||
| add_custom_testing_target_compile_definitions() | ||
| endif() | ||
|
|
||
| setup_install() | ||
|
|
||
| install (FILES ${AWS_TESTING_HEADERS} DESTINATION ${INCLUDE_DIRECTORY}/aws/testing) | ||
| install (FILES ${AWS_TESTING_EXTERNAL_HEADERS} DESTINATION ${INCLUDE_DIRECTORY}/aws/external) | ||
| install (FILES ${AWS_TESTING_PLATFORM_HEADERS} DESTINATION ${INCLUDE_DIRECTORY}/aws/testing/platform) | ||
| install (FILES ${AWS_TESTING_AUTH_MOCKS_HEADERS} DESTINATION ${INCLUDE_DIRECTORY}/aws/testing/mocks/aws/auth) | ||
| install (FILES ${AWS_TESTING_CLIENT_MOCKS_HEADERS} DESTINATION ${INCLUDE_DIRECTORY}/aws/testing/mocks/aws/client) | ||
| install (FILES ${AWS_TESTING_EVENT_MOCKS_HEADERS} DESTINATION ${INCLUDE_DIRECTORY}/aws/testing/mocks/event) | ||
| install (FILES ${AWS_TESTING_HTTP_MOCKS_HEADERS} DESTINATION ${INCLUDE_DIRECTORY}/aws/testing/mocks/http) | ||
| install (FILES ${AWS_TESTING_MONITORING_MOCKS_HEADERS} DESTINATION ${INCLUDE_DIRECTORY}/aws/testing/mocks/monitoring) | ||
|
|
||
| do_packaging() | ||
| endif() |
6 changes: 6 additions & 0 deletions
6
src/aws-cpp-sdk-core-tests/testing-resources/include/CMakeLists.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| target_include_directories( | ||
| aws-sdk-cpp-test-resources | ||
| BEFORE | ||
| PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} | ||
|
|
||
| ) |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 6 additions & 0 deletions
6
src/aws-cpp-sdk-core-tests/testing-resources/source/CMakeLists.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| target_sources( | ||
| aws-sdk-cpp-test-resources | ||
| PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/MemoryTesting.cpp | ||
| PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/TestingEnvironment.cpp | ||
| PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/platform/linux-shared/PlatformTesting.cpp | ||
| ) |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,6 @@ | ||
| target_include_directories( | ||
| aws-sdk-cpp-core | ||
| BEFORE | ||
| PUBLIC ${CMAKE_CURRENT_BINARY_DIR} #For generated Headers as VersionConfig and SDKConfig | ||
| PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} | ||
| ) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why not follow HEAD? from their page
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Because we know what version works with our build at this particular version. If head is not backward compatible at some point tests of old versions of SDK will not work anymore.