Skip to content

Commit c6ea204

Browse files
committed
Moving core test and test resources to test/
1 parent dcb101b commit c6ea204

File tree

434 files changed

+9
-10
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

434 files changed

+9
-10
lines changed

src/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
11
add_subdirectory(aws-cpp-sdk-core)
2-
if (BUILD_TESTING)
3-
add_subdirectory(testing-resources)
4-
add_subdirectory(aws-cpp-sdk-core-tests)
5-
endif ()

tests/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
if (BUILD_TESTING)
2+
add_subdirectory(../tests/testing-resources)
3+
add_subdirectory(../tests/aws-cpp-sdk-core-tests)
4+
# Integration testing
25
add_subdirectory(aws-cpp-sdk-dynamodb-integration-tests)
36
endif ()

src/aws-cpp-sdk-core-tests/CMakeLists.txt renamed to tests/aws-cpp-sdk-core-tests/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ else ()
2929

3030
# Headers are included in the source so that they show up in Visual Studio.
3131
# They are included elsewhere for consistency.
32-
file(GLOB AWS_SRC "${CMAKE_CURRENT_SOURCE_DIR}/aws/*.cpp")
33-
file(GLOB AWS_AUTH_SRC "${CMAKE_CURRENT_SOURCE_DIR}/aws/auth/*.cpp")
34-
file(GLOB AWS_CONFIG_SRC "${CMAKE_CURRENT_SOURCE_DIR}/aws/config/*.cpp")
35-
file(GLOB AWS_CLIENT_SRC "${CMAKE_CURRENT_SOURCE_DIR}/aws/client/*.cpp")
36-
file(GLOB AWS_NET_SRC "${CMAKE_CURRENT_SOURCE_DIR}/aws/net/*.cpp")
32+
file(GLOB AWS_SRC "aws/*.cpp")
33+
file(GLOB AWS_AUTH_SRC "aws/auth/*.cpp")
34+
file(GLOB AWS_CONFIG_SRC "aws/config/*.cpp")
35+
file(GLOB AWS_CLIENT_SRC "aws/client/*.cpp")
36+
file(GLOB AWS_NET_SRC "aws/net/*.cpp")
3737
file(GLOB HTTP_SRC "${CMAKE_CURRENT_SOURCE_DIR}/http/*.cpp")
3838
file(GLOB UTILS_SRC "${CMAKE_CURRENT_SOURCE_DIR}/utils/*.cpp")
3939
file(GLOB UTILS_CRYPTO_SRC "${CMAKE_CURRENT_SOURCE_DIR}/utils/crypto/*.cpp")
@@ -131,7 +131,7 @@ else ()
131131

132132
add_custom_command(TARGET aws-cpp-sdk-core-tests PRE_BUILD
133133
COMMAND ${CMAKE_COMMAND} -E copy_directory
134-
${CMAKE_CURRENT_SOURCE_DIR}/resources ${CMAKE_CURRENT_BINARY_DIR})
134+
resources ${CMAKE_CURRENT_BINARY_DIR})
135135

136136
if (ENABLE_HTTP_CLIENT_TESTING)
137137
add_definitions(-DENABLE_HTTP_CLIENT_TESTING)

0 commit comments

Comments
 (0)