Skip to content

Commit 2bda2f5

Browse files
baxeazbaxeaz
committed
Orbis platform fixes
1 parent 4304269 commit 2bda2f5

File tree

17 files changed

+137
-12
lines changed

17 files changed

+137
-12
lines changed

‎aws-cpp-sdk-cloudfront-integration-tests/RunTests.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,22 @@
1515

1616
#include <aws/external/gtest.h>
1717
#include <aws/core/Aws.h>
18+
#include <aws/testing/platform/PlatformTesting.h>
1819

1920
int main(int argc, char** argv)
2021
{
2122
Aws::SDKOptions options;
23+
24+
Aws::Testing::InitPlatformTest(options);
25+
2226
options.loggingOptions.logLevel = Aws::Utils::Logging::LogLevel::Trace;
2327
Aws::InitAPI(options);
2428
::testing::InitGoogleTest(&argc, argv);
2529
int exitCode = RUN_ALL_TESTS();
2630
Aws::ShutdownAPI(options);
31+
32+
33+
Aws::Testing::ShutdownPlatformTest(options);
2734
return exitCode;
2835
}
2936

‎aws-cpp-sdk-cognitoidentity-integration-tests/RunTests.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,21 @@
1515

1616
#include <aws/external/gtest.h>
1717
#include <aws/core/Aws.h>
18+
#include <aws/testing/platform/PlatformTesting.h>
1819

1920
int main(int argc, char** argv)
2021
{
2122
Aws::SDKOptions options;
23+
24+
Aws::Testing::InitPlatformTest(options);
25+
2226
options.loggingOptions.logLevel = Aws::Utils::Logging::LogLevel::Trace;
2327
Aws::InitAPI(options);
2428
::testing::InitGoogleTest(&argc, argv);
2529
int exitCode = RUN_ALL_TESTS();
2630
Aws::ShutdownAPI(options);
31+
32+
33+
Aws::Testing::ShutdownPlatformTest(options);
2734
return exitCode;
2835
}

‎aws-cpp-sdk-core-tests/RunTests.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,23 @@
1818
#include <aws/core/http/HttpClientFactory.h>
1919
#include <aws/core/Aws.h>
2020
#include <aws/testing/TestingEnvironment.h>
21+
#include <aws/testing/platform/PlatformTesting.h>
2122

2223
int main(int argc, char** argv)
2324
{
25+
2426
Aws::Testing::RedirectHomeToTempIfAppropriate();
2527

2628
Aws::SDKOptions options;
29+
30+
Aws::Testing::InitPlatformTest(options);
31+
2732
Aws::InitAPI(options);
2833
::testing::InitGoogleTest(&argc, argv);
2934
int retVal = RUN_ALL_TESTS();
3035
Aws::ShutdownAPI(options);
36+
37+
Aws::Testing::ShutdownPlatformTest(options);
38+
3139
return retVal;
3240
}

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,11 @@ endif(MSVC)
316316

317317
set(Core_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/include/")
318318

319+
if(PLATFORM_CUSTOM)
320+
add_custom_core_include_directories(CORE_CUSTOM_INCLUDE)
321+
SET(Core_INCLUDES ${Core_INCLUDES} ${CORE_CUSTOM_INCLUDE})
322+
endif()
323+
319324
include_directories(${Core_INCLUDES})
320325

321326
if(NOT PLATFORM_CUSTOM)
@@ -344,6 +349,10 @@ if(ENABLE_OPENSSL_ENCRYPTION AND BUILD_OPENSSL)
344349
add_dependencies(aws-cpp-sdk-core OPENSSL)
345350
endif()
346351

352+
if(PLATFORM_CUSTOM)
353+
add_custom_core_libraries()
354+
endif()
355+
347356
target_include_directories(aws-cpp-sdk-core PUBLIC
348357
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
349358
$<INSTALL_INTERFACE:include>)

‎aws-cpp-sdk-dynamodb-integration-tests/RunTests.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,21 @@
1515

1616
#include <aws/external/gtest.h>
1717
#include <aws/core/Aws.h>
18+
#include <aws/testing/platform/PlatformTesting.h>
1819

1920
int main(int argc, char** argv)
2021
{
2122
Aws::SDKOptions options;
23+
24+
Aws::Testing::InitPlatformTest(options);
25+
2226
options.loggingOptions.logLevel = Aws::Utils::Logging::LogLevel::Trace;
2327
Aws::InitAPI(options);
2428
::testing::InitGoogleTest(&argc, argv);
2529
int exitCode = RUN_ALL_TESTS();
2630
Aws::ShutdownAPI(options);
31+
32+
Aws::Testing::ShutdownPlatformTest(options);
2733
return exitCode;
2834
}
2935

‎aws-cpp-sdk-identity-management-tests/RunTests.cpp

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,22 @@
1616
#include <aws/external/gtest.h>
1717
#include <aws/testing/TestingEnvironment.h>
1818
#include <aws/core/Aws.h>
19+
#include <aws/testing/platform/PlatformTesting.h>
1920

2021
int main(int argc, char** argv)
2122
{
2223
Aws::Testing::RedirectHomeToTempIfAppropriate();
2324

2425
Aws::SDKOptions options;
26+
27+
Aws::Testing::InitPlatformTest(options);
28+
29+
options.loggingOptions.logLevel = Aws::Utils::Logging::LogLevel::Trace;
2530
Aws::InitAPI(options);
2631
::testing::InitGoogleTest(&argc, argv);
27-
int result = RUN_ALL_TESTS();
32+
int exitCode = RUN_ALL_TESTS();
2833
Aws::ShutdownAPI(options);
2934

30-
return result;
31-
}
35+
Aws::Testing::ShutdownPlatformTest(options);
36+
return exitCode;
37+
}

‎aws-cpp-sdk-lambda-integration-tests/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ include_directories(${AWS_LAMBDA_INTEGRATION_TEST_APPLICATION_INCLUDES})
2828

2929
if(PLATFORM_ANDROID)
3030
add_definitions(-DRESOURCES_DIR="resources")
31+
elseif(COMMAND add_custom_lambda_resources_directory_definition)
32+
add_custom_lambda_resources_directory_definition()
3133
else()
3234
add_definitions(-DRESOURCES_DIR="${CMAKE_CURRENT_SOURCE_DIR}/resources")
3335
endif()
@@ -46,3 +48,7 @@ endif()
4648

4749
target_link_libraries(runLambdaIntegrationTests aws-cpp-sdk-kinesis aws-cpp-sdk-lambda aws-cpp-sdk-cognito-identity aws-cpp-sdk-access-management aws-cpp-sdk-iam testing-resources)
4850
copyDlls(runLambdaIntegrationTests aws-cpp-sdk-core aws-cpp-sdk-kinesis aws-cpp-sdk-lambda aws-cpp-sdk-cognito-identity aws-cpp-sdk-access-management aws-cpp-sdk-iam testing-resources)
51+
52+
if(COMMAND copy_lambda_testing_resources)
53+
copy_lambda_testing_resources()
54+
endif()

‎aws-cpp-sdk-lambda-integration-tests/RunTests.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,21 @@
1515

1616
#include <aws/external/gtest.h>
1717
#include <aws/core/Aws.h>
18+
#include <aws/testing/platform/PlatformTesting.h>
1819

1920
int main(int argc, char** argv)
2021
{
2122
Aws::SDKOptions options;
23+
24+
Aws::Testing::InitPlatformTest(options);
25+
2226
options.loggingOptions.logLevel = Aws::Utils::Logging::LogLevel::Trace;
2327
Aws::InitAPI(options);
2428
::testing::InitGoogleTest(&argc, argv);
2529
int exitCode = RUN_ALL_TESTS();
2630
Aws::ShutdownAPI(options);
31+
32+
Aws::Testing::ShutdownPlatformTest(options);
2733
return exitCode;
2834
}
2935

‎aws-cpp-sdk-redshift-integration-tests/RunTests.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,21 @@
1515

1616
#include <aws/external/gtest.h>
1717
#include <aws/core/Aws.h>
18+
#include <aws/testing/platform/PlatformTesting.h>
1819

1920
int main(int argc, char** argv)
2021
{
2122
Aws::SDKOptions options;
23+
24+
Aws::Testing::InitPlatformTest(options);
25+
2226
options.loggingOptions.logLevel = Aws::Utils::Logging::LogLevel::Trace;
2327
Aws::InitAPI(options);
2428
::testing::InitGoogleTest(&argc, argv);
25-
int exitCode = RUN_ALL_TESTS();
29+
int exitCode = RUN_ALL_TESTS();
2630
Aws::ShutdownAPI(options);
31+
32+
Aws::Testing::ShutdownPlatformTest(options);
2733
return exitCode;
2834
}
2935

‎aws-cpp-sdk-s3-integration-tests/RunTests.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,21 @@
1515

1616
#include <aws/external/gtest.h>
1717
#include <aws/core/Aws.h>
18+
#include <aws/testing/platform/PlatformTesting.h>
1819

1920
int main(int argc, char** argv)
2021
{
2122
Aws::SDKOptions options;
23+
24+
Aws::Testing::InitPlatformTest(options);
25+
2226
options.loggingOptions.logLevel = Aws::Utils::Logging::LogLevel::Trace;
2327
Aws::InitAPI(options);
2428
::testing::InitGoogleTest(&argc, argv);
2529
int exitCode = RUN_ALL_TESTS();
2630
Aws::ShutdownAPI(options);
31+
32+
Aws::Testing::ShutdownPlatformTest(options);
2733
return exitCode;
2834
}
2935

‎aws-cpp-sdk-sqs-integration-tests/RunTests.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,21 @@
1515

1616
#include <aws/external/gtest.h>
1717
#include <aws/core/Aws.h>
18+
#include <aws/testing/platform/PlatformTesting.h>
1819

1920
int main(int argc, char** argv)
2021
{
2122
Aws::SDKOptions options;
23+
24+
Aws::Testing::InitPlatformTest(options);
25+
2226
options.loggingOptions.logLevel = Aws::Utils::Logging::LogLevel::Trace;
2327
Aws::InitAPI(options);
2428
::testing::InitGoogleTest(&argc, argv);
2529
int exitCode = RUN_ALL_TESTS();
2630
Aws::ShutdownAPI(options);
31+
32+
Aws::Testing::ShutdownPlatformTest(options);
2733
return exitCode;
2834
}
2935

‎aws-cpp-sdk-transfer-tests/RunTests.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,21 @@
1515

1616
#include <aws/external/gtest.h>
1717
#include <aws/core/Aws.h>
18+
#include <aws/testing/platform/PlatformTesting.h>
1819

1920
int main(int argc, char** argv)
2021
{
2122
Aws::SDKOptions options;
23+
24+
Aws::Testing::InitPlatformTest(options);
25+
2226
options.loggingOptions.logLevel = Aws::Utils::Logging::LogLevel::Trace;
2327
Aws::InitAPI(options);
2428
::testing::InitGoogleTest(&argc, argv);
2529
int exitCode = RUN_ALL_TESTS();
2630
Aws::ShutdownAPI(options);
31+
32+
Aws::Testing::ShutdownPlatformTest(options);
2733
return exitCode;
2834
}
2935

‎testing-resources/CMakeLists.txt

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,11 @@ set(INCLUDES
7474
"${CORE_DIR}/include/"
7575
)
7676

77+
if(PLATFORM_CUSTOM)
78+
add_custom_core_include_directories(CUSTOM_INCLUDE)
79+
set(INCLUDES ${INCLUDES} ${CUSTOM_INCLUDE})
80+
endif()
81+
7782
include_directories(${INCLUDES})
7883

7984
if(USE_WINDOWS_DLL_SEMANTICS AND BUILD_SHARED_LIBS)
@@ -87,16 +92,12 @@ endif()
8792

8893
add_library(testing-resources ${LIBTYPE} ${TestingResources_SRC})
8994

95+
if(PLATFORM_CUSTOM)
96+
add_custom_testing_target_compile_definitions()
97+
endif()
98+
9099
target_include_directories(testing-resources PUBLIC
91100
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
92101
$<INSTALL_INTERFACE:include>)
93102
target_link_libraries(testing-resources aws-cpp-sdk-core)
94103

95-
if(COMMAND add_custom_testing_link_libraries)
96-
add_custom_testing_link_libraries()
97-
endif()
98-
99-
if(COMMAND add_custom_testing_target_compile_definitions)
100-
add_custom_testing_target_compile_definitions()
101-
endif()
102-

‎testing-resources/include/aws/testing/platform/PlatformTesting.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#pragma once
1818

1919
#include <aws/testing/Testing_EXPORTS.h>
20+
#include <aws/core/Aws.h>
2021

2122
namespace Aws
2223
{
@@ -34,4 +35,9 @@ namespace Environment
3435
AWS_TESTING_API int UnSetEnv(const char* name);
3536

3637
} // namespace Environment
38+
namespace Testing
39+
{
40+
AWS_TESTING_API void InitPlatformTest(Aws::SDKOptions& sdkOptions);
41+
AWS_TESTING_API void ShutdownPlatformTest(Aws::SDKOptions& sdkOptions);
42+
} // namespace Testing
3743
} // namespace Aws

‎testing-resources/source/platform/android/PlatformTesting.cpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,17 @@ int UnSetEnv(const char* name)
3333
}
3434

3535
} // namespace Environment
36+
37+
namespace Testing
38+
{
39+
void InitPlatformTest(Aws::SDKOptions& sdkOptions)
40+
{
41+
AWS_UNREFERENCED_PARAM(sdkOptions);
42+
}
43+
44+
void ShutdownPlatformTest(Aws::SDKOptions& sdkOptions)
45+
{
46+
AWS_UNREFERENCED_PARAM(sdkOptions);
47+
}
48+
} // namespace Testing
3649
} // namespace Aws

‎testing-resources/source/platform/linux-shared/PlatformTesting.cpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,17 @@ int UnSetEnv(const char* name)
3131
}
3232

3333
} // namespace Environment
34+
35+
namespace Testing
36+
{
37+
void InitPlatformTest(Aws::SDKOptions& sdkOptions)
38+
{
39+
AWS_UNREFERENCED_PARAM(sdkOptions);
40+
}
41+
42+
void ShutdownPlatformTest(Aws::SDKOptions& sdkOptions)
43+
{
44+
AWS_UNREFERENCED_PARAM(sdkOptions);
45+
}
46+
} // namespace Testing
3447
} // namespace Aws

‎testing-resources/source/platform/windows/PlatformTesting.cpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,17 @@ int UnSetEnv(const char* name)
3939
}
4040

4141
} // namespace Environment
42+
43+
namespace Testing
44+
{
45+
void InitPlatformTest(Aws::SDKOptions& sdkOptions)
46+
{
47+
AWS_UNREFERENCED_PARAM(sdkOptions);
48+
}
49+
50+
void ShutdownPlatformTest(Aws::SDKOptions& sdkOptions)
51+
{
52+
AWS_UNREFERENCED_PARAM(sdkOptions);
53+
}
54+
} // namespace Testing
4255
} // namespace Aws

0 commit comments

Comments
 (0)