Merge pull request #16 from awslabs/FB-EnableTesting

Fb enable testing

Author: JonathanHenson

CMakeLists.txt

@@ -42,16 +42,16 @@ find_package(Git)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
 # TODO: convert boolean invocation variables to options
-option(MINIMIZE_SIZE "If enabled, the SDK will be built via a unity aggregation process that results in smaller static libraries; additionally, release binaries will favor size optimizations over speed" OFF)
 option(ENABLE_UNITY_BUILD "If enabled, the SDK will be built using a single unified .cpp file for each service library.  Reduces the size of static library binaries on Windows and Linux" OFF)
+option(MINIMIZE_SIZE "If enabled, the SDK will be built via a unity aggregation process that results in smaller static libraries; additionally, release binaries will favor size optimizations over speed" OFF)
 option(BUILD_SHARED_LIBS "If enabled, all aws sdk libraries will be build as shared objects; otherwise all Aws libraries will be built as static objects" ON)
 option(FORCE_SHARED_CRT "If enabled, will unconditionally link the standard libraries in dynamically, otherwise the standard library will be linked in based on the BUILD_SHARED_LIBS setting" ON)
 option(DISABLE_ANDROID_STANDALONE_BUILD "If enabled, the android build will not attempt to generate a standalone toolchain and instead rely on externally passed cmake parameters to specify the complete build environment.  The included toolchain file is still used." OFF)
 option(SIMPLE_INSTALL "If enabled, removes all the additional indirection (platform/cpu/config) in the bin and lib directories on the install step" ON)
 option(NO_HTTP_CLIENT "If enabled, no platform-default http client will be included in the library.  For the library to be used you will need to provide your own platform-specific implementation" OFF)
 option(NO_ENCRYPTION "If enabled, no platform-default encryption will be included in the library.  For the library to be used you will need to provide your own platform-specific implementations" OFF)
 option(ENABLE_RTTI "Flag to enable/disable rtti within the library" ON)
-
+option(ENABLE_TESTING "Flag to enable/disable building unit and integration tests" ON)
 
 # backwards compatibility with old command line params
 if("${STATIC_LINKING}" STREQUAL "1")
@@ -1010,8 +1010,6 @@ LIST(APPEND EXPORTS "")
 #sdks
 add_subdirectory(aws-cpp-sdk-core)
 LIST(APPEND EXPORTS "aws-cpp-sdk-core")
-add_subdirectory(testing-resources)
-add_subdirectory(aws-cpp-sdk-core-tests)
 
 foreach(SDK IN LISTS SDK_BUILD_LIST)
     SET(SDK_DIR "aws-cpp-sdk-${SDK}")
@@ -1041,30 +1039,35 @@ foreach(custom_client ${ADD_CUSTOM_CLIENTS})
 endforeach(custom_client)
 
 #testing
-if(PLATFORM_ANDROID AND NOT BUILD_SHARED_LIBS)
-    add_subdirectory(android-unified-tests)
-else()
-    foreach(SDK IN LISTS SDK_BUILD_LIST)
-        get_test_project_for_service(${SDK} TEST_PROJECT)
-        if(TEST_PROJECT) 
-            # before we add the test, make sure all of its dependencies are present
-            set(ADD_TEST 1)
-            get_dependencies_for_test(${SDK} DEPENDENCY_LIST)
-            if(DEPENDENCY_LIST)
-                STRING(REPLACE "," ";" LIST_RESULT ${DEPENDENCY_LIST})
-                foreach(DEPENDENCY IN LISTS LIST_RESULT)
-                    list(FIND SDK_BUILD_LIST ${DEPENDENCY} DEPENDENCY_INDEX)
-                    if(DEPENDENCY_INDEX LESS 0)
-                        set(ADD_TEST 0)
-                    endif()
-                endforeach()
-            endif()
+if(ENABLE_TESTING)
+    add_subdirectory(testing-resources)
 
-            if(ADD_TEST)
-                add_subdirectory(${TEST_PROJECT})
-            endif()
-        endif()
-     endforeach()
+    if(PLATFORM_ANDROID AND NOT BUILD_SHARED_LIBS)
+	add_subdirectory(android-unified-tests)
+    else()
+        add_subdirectory(aws-cpp-sdk-core-tests)
+	foreach(SDK IN LISTS SDK_BUILD_LIST)
+	    get_test_project_for_service(${SDK} TEST_PROJECT)
+	    if(TEST_PROJECT) 
+		# before we add the test, make sure all of its dependencies are present
+		set(ADD_TEST 1)
+		get_dependencies_for_test(${SDK} DEPENDENCY_LIST)
+		if(DEPENDENCY_LIST)
+		    STRING(REPLACE "," ";" LIST_RESULT ${DEPENDENCY_LIST})
+		    foreach(DEPENDENCY IN LISTS LIST_RESULT)
+			list(FIND SDK_BUILD_LIST ${DEPENDENCY} DEPENDENCY_INDEX)
+			if(DEPENDENCY_INDEX LESS 0)
+			    set(ADD_TEST 0)
+			endif()
+		    endforeach()
+		endif()
+
+		if(ADD_TEST)
+		    add_subdirectory(${TEST_PROJECT})
+		endif()
+	    endif()
+	 endforeach()
+    endif()
 endif()
 
 export(TARGETS ${EXPORTS} FILE aws-sdk-cpp-config.cmake)

README.md

@@ -72,7 +72,7 @@ Nmake builds targets in a serial fashion.  To make things quicker, we recommend
 
 cmake -G "NMake Makefiles JOM" -DTARGET_ARCH=ANDROID <other options> ..
 
-####CMake Variables
+####General CMake Variables
 
 #####BUILD_ONLY
 Allows you to only build the clients you want to use. This will resolve low level client dependencies if you set this to a high-level sdk such as aws-cpp-sdk-transfer. This will also build integration and unit tests related to the projects you select if they exist. aws-cpp-sdk-core always builds regardless of the value of this argument. This is a list argument. Example: -DBUILD_ONLY="aws-cpp-sdk-s3;aws-cpp-sdk-dynamodb;aws-cpp-sdk-cognito-identity"
@@ -90,9 +90,6 @@ If static linking is enabled, custom memory management defaults to off. If dynam
 
 Note: To prevent linker mismatch errors, you must use the same value (0 or 1) throughout your build system.
 
-#####STATIC_LINKING 
-To use static linking, set the value to 1. By default the build creates shared libraries for each platform. If you dynamically link to the SDK you will need to define the USE_IMPORT_EXPORT symbol for all build targets using the SDK.
-
 #####TARGET_ARCH
 To cross compile or build for a mobile platform, you must specify the target platform. By default the build detects the host operating system and builds for that operating system. 
 Options: WINDOWS | LINUX | APPLE | ANDROID
@@ -105,6 +102,57 @@ Windows example:
 
 For more information, see the CMake documentation for your platform.
 
+#### General CMake Options
+CMake options are variables that can either be ON or OFF, with a controllable default.  You can set an option either with CMake Gui tools or the command line via -D.
+
+#####ENABLE_UNITY_BUILD 
+(Defaults to OFF) If enabled, most SDK libraries will be built as a single, generated .cpp file.  This can significantly reduce static library size as well as speed up compilation time.
+
+#####MINIMIZE_SIZE 
+(Defaults to OFF) A superset of ENABLE_UNITY_BUILD, if enabled this option turns on ENABLE_UNITY_BUILD as well as some additional binary size reduction settings.  This is a work-in-progress and may change in the future (symbol stripping in particular).
+
+#####BUILD_SHARED_LIBS 
+(Defaults to ON) A built-in CMake option, reexposed here for visibility.  If enabled, shared libraries will be built, otherwise static libraries will be built.
+
+#####FORCE_SHARED_CRT 
+(Defaults to ON) If enabled, the SDK will link to the C runtime dynamically, otherwise it will use the BUILD_SHARED_LIBS setting (weird but necessary for backwards compatibility with older versions of the SDK)
+
+#####SIMPLE_INSTALL 
+(Defaults to ON) If enabled, the install process will not insert platform-specific intermediate directories underneath bin/ and lib/.  Turn OFF if you need to make multi-platform releases under a single install directory.
+
+#####NO_HTTP_CLIENT
+(Defaults to OFF) If enabled, prevents the default platform-specific http client from being built into the library.  Turn this ON if you wish to inject your own http client implementation.
+
+#####NO_ENCRYPTION
+(Defaults to OFF) If enabled, prevents the default platform-specific cryptography implementation from being built into the library.  Turn this ON if you wish to inject your own cryptography implementation.
+
+#####ENABLE_RTTI 
+(Defaults to ON) Controls whether or not the SDK is built with RTTI information
+
+#####ENABLE_TESTING 
+(Defaults to ON) Controls whether or not the unit and integration test projects are built
+
+#### Android CMake Variables/Options
+
+#####NDK_DIR
+An override path for where the build system should find the Android NDK.  By default, the build system will check environment variables (ANDROID_NDK) if this CMake variable is not set.
+
+#####DISABLE_ANDROID_STANDALONE_BUILD 
+(Defaults to OFF) By default, Android builds will use a standalone clang-based toolchain constructed via NDK scripts.  If you wish to use your own toolchain, turn this option ON.
+
+#####ANDROID_STL
+(Defaults to libc++_shared)  Controls what flavor of the C++ standard library the SDK will use.  Valid values are one of {libc++_shared, libc++_static, gnustl_shared, gnustl_static}.  There are severe performance problems within the SDK if gnustl is used, so we recommend libc++.
+
+#####ANDROID_ABI
+(Defaults to armeabi-v7a) Controls what abi to output code for.  Not all valid Android ABI values are currently supported, but we intend to provide full coverage in the future.  We welcome patches to our Openssl build wrapper that speed this process up.  Valid values are one of {arm64, armeabi-v7a, x86_64, x86, mips64, mips}. 
+
+#####ANDROID_TOOLCHAIN_NAME
+(Defaults to standalone-clang) Controls which compiler is used to build the SDK.  With GCC being deprecated by Android NDK, we recommend using the default (clang).
+
+#####ANDROID_NATIVE_API_LEVEL
+(Default varies by STL choice) Controls what API level the SDK will be built against.  If you use gnustl, you have complete freedom with the choice of API level.  If you use libc++, you must use an API level of at least 21.
+
+
 ###Running integration tests:
 Several directories are appended with *integration-tests. After building your project, you can run these executables to ensure everything works properly.