Made Testing-Resources a library, DDB integ test works

Moved Testing-Resources target to be a library since we use
it in all the tests, integ and unit.
Fixed missed inclussion in platform testing that prevented
symbols to be accessible for the consumers of the library.
Added generated Testing-Resources export.
Added build of DynamoDB integration tests.

Author: sdavtaker

src/CMakeLists.txt

@@ -1,4 +1,5 @@
 add_subdirectory(aws-cpp-sdk-core)
 if (BUILD_TESTING)
+    add_subdirectory(testing-resources)
     add_subdirectory(aws-cpp-sdk-core-tests)
 endif ()

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

@@ -5,6 +5,7 @@ if (NOT LEGACY_BUILD)
             aws-sdk-cpp-core-test
             GTest::GTest
             aws-sdk-cpp::core
+            aws-sdk-cpp::testing-resources
             aws-crt-cpp
     )
     target_sources(
@@ -17,7 +18,6 @@ if (NOT LEGACY_BUILD)
     add_subdirectory(aws)
     add_subdirectory(http)
     add_subdirectory(monitoring)
-    add_subdirectory(testing-resources)
     add_subdirectory(utils)
 
     gtest_discover_tests(aws-sdk-cpp-core-test)

src/aws-cpp-sdk-core-tests/testing-resources/include/CMakeLists.txt

@@ -28,7 +28,6 @@ if (NOT LEGACY_BUILD)
             EXPORT_MACRO_NAME AWS_CORE_API # to be backward compatible during LEGACY_BUILD exist until 1.11
     )
 
-
     add_subdirectory(include)
     add_subdirectory(source)
 else ()

src/aws-cpp-sdk-core-tests/testing-resources/include/aws/testing/Testing_EXPORTS.h

@@ -2,6 +2,15 @@
 # SPDX-License-Identifier: Apache-2.0.
 #
 if (NOT LEGACY_BUILD)
+    add_library(aws-sdk-cpp-testing-resources)
+    add_library(aws-sdk-cpp::testing-resources ALIAS aws-sdk-cpp-testing-resources)
+
+    target_link_libraries(
+            aws-sdk-cpp-testing-resources
+            aws-sdk-cpp::core
+            GTest::GTest
+    )
+
     add_subdirectory(include)
     add_subdirectory(source)
 else()

src/aws-cpp-sdk-core/CMakeLists.txt

@@ -0,0 +1,12 @@
+target_include_directories(
+        aws-sdk-cpp-testing-resources
+        BEFORE
+        PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
+        PUBLIC ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+include(GenerateExportHeader)
+generate_export_header(
+        aws-sdk-cpp-testing-resources
+        EXPORT_MACRO_NAME AWS_TESTING_API # to be backward compatible during LEGACY_BUILD exist until 1.11
+)

src/aws-cpp-sdk-core-tests/testing-resources/.gitignore renamed to src/testing-resources/.gitignore

@@ -0,0 +1,28 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+
+#ifdef NON_LEGACY_BUILD
+#include "aws-sdk-cpp-testing-resources_export.h"
+#else
+    #if defined (USE_WINDOWS_DLL_SEMANTICS) || defined (_WIN32)
+    #ifdef _MSC_VER
+    #pragma warning(disable : 4251)
+    #endif // MSVC
+
+    #ifdef USE_IMPORT_EXPORT
+    #ifdef AWS_TESTING_EXPORTS
+    #define  AWS_TESTING_API __declspec(dllexport)
+    #else
+    #define  AWS_TESTING_API __declspec(dllimport)
+    #endif /* AWS_TESTING_EXPORTS */
+    #else
+    #define AWS_TESTING_API
+    #endif // USE_IMPORT_EXPORT
+    #else // defined (USE_WINDOWS_DLL_SEMANTICS) || defined (_WIN32)
+    #define AWS_TESTING_API
+    #endif // defined (USE_WINDOWS_DLL_SEMANTICS) || defined (_WIN32)
+#endif

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

@@ -1,5 +1,5 @@
 target_sources(
-        aws-sdk-cpp-core-test
+        aws-sdk-cpp-testing-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

src/testing-resources/include/CMakeLists.txt

@@ -5,6 +5,7 @@
 
 #include <stdlib.h>
 
+#include <aws/testing/platform/PlatformTesting.h>
 #include <aws/core/Aws.h>
 
 namespace Aws

src/aws-cpp-sdk-core-tests/testing-resources/include/aws/external/gtest/gtest-assertion-result.h renamed to src/testing-resources/include/aws/external/gtest/gtest-assertion-result.h

@@ -0,0 +1,3 @@
+if (BUILD_TESTING)
+    add_subdirectory(aws-cpp-sdk-dynamodb-integration-tests)
+endif ()

src/aws-cpp-sdk-core-tests/testing-resources/include/aws/external/gtest/gtest-aws-helper.h renamed to src/testing-resources/include/aws/external/gtest/gtest-aws-helper.h

@@ -1,28 +1,47 @@
-add_project(aws-cpp-sdk-dynamodb-integration-tests 
-    "Tests for the AWS DynamoDb C++ SDK" 
-    aws-cpp-sdk-dynamodb 
-    testing-resources 
-    aws-cpp-sdk-core)
+if (NOT LEGACY_BUILD)
+    add_executable(aws-cpp-sdk-dynamodb-integration-tests)
 
-# Headers are included in the source so that they show up in Visual Studio.
-# They are included elsewhere for consistency.
+    target_link_libraries(
+            aws-cpp-sdk-dynamodb-integration-tests
+            GTest::GTest
+            aws-sdk-cpp::dynamodb
+            aws-sdk-cpp::testing-resources
+    )
+    target_sources(
+            aws-cpp-sdk-dynamodb-integration-tests
+            PRIVATE
+            ${CMAKE_CURRENT_SOURCE_DIR}/RunTests.cpp
+            ${CMAKE_CURRENT_SOURCE_DIR}/TableOperationTest.cpp
+    )
+    gtest_discover_tests(aws-cpp-sdk-dynamodb-integration-tests)
 
-file(GLOB AWS_DYNAMO_SRC "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
-file(GLOB AWS_DYNAMO_INTEGRATION_TESTS_SRC ${AWS_DYNAMO_SRC})
+else()
+    add_project(aws-cpp-sdk-dynamodb-integration-tests
+        "Tests for the AWS DynamoDb C++ SDK"
+        aws-cpp-sdk-dynamodb
+        testing-resources
+        aws-cpp-sdk-core)
 
-if(MSVC AND BUILD_SHARED_LIBS)
-    add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY=1)
-endif()
+    # Headers are included in the source so that they show up in Visual Studio.
+    # They are included elsewhere for consistency.
 
-enable_testing()
+    file(GLOB AWS_DYNAMO_SRC "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
+    file(GLOB AWS_DYNAMO_INTEGRATION_TESTS_SRC ${AWS_DYNAMO_SRC})
 
-if(PLATFORM_ANDROID AND BUILD_SHARED_LIBS)
-    add_library(${PROJECT_NAME} ${AWS_DYNAMO_INTEGRATION_TESTS_SRC})
-else()
-    add_executable(${PROJECT_NAME} ${AWS_DYNAMO_INTEGRATION_TESTS_SRC})
-endif()
+    if(MSVC AND BUILD_SHARED_LIBS)
+        add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY=1)
+    endif()
+
+    enable_testing()
+
+    if(PLATFORM_ANDROID AND BUILD_SHARED_LIBS)
+        add_library(${PROJECT_NAME} ${AWS_DYNAMO_INTEGRATION_TESTS_SRC})
+    else()
+        add_executable(${PROJECT_NAME} ${AWS_DYNAMO_INTEGRATION_TESTS_SRC})
+    endif()
 
-set_compiler_flags(${PROJECT_NAME})
-set_compiler_warnings(${PROJECT_NAME})
+    set_compiler_flags(${PROJECT_NAME})
+    set_compiler_warnings(${PROJECT_NAME})
 
-target_link_libraries(${PROJECT_NAME} ${PROJECT_LIBS})
+    target_link_libraries(${PROJECT_NAME} ${PROJECT_LIBS})
+endif()