Add tests for the static library if built

When we are bulding the static library, then a second version
of each of the non-legacy tests is generated, linked against
it. These are run together with the shared library versions.

Author: minusbat

Test/CMakeLists.txt

@@ -117,7 +117,7 @@ set_target_properties(test_runtime PROPERTIES
 
 # Function for adding a test.  This takes the name of the test and the list of
 # source files as arguments.
-function(addtest_flags TEST_NAME FLAGS TEST_SOURCE)
+function(addtest_flags TEST_NAME FLAGS TEST_SOURCE LINK_TARGET)
 	if (${TEST_NAME} MATCHES ".*_arc")
 		# Only compile the main file with ARC
 		set_source_files_properties(${TEST_SOURCE}
@@ -139,21 +139,28 @@ function(addtest_flags TEST_NAME FLAGS TEST_SOURCE)
 	if(WIN32)
 		set_property(TEST ${TEST_NAME} PROPERTY ENVIRONMENT_MODIFICATION "PATH=path_list_append:${CMAKE_BINARY_DIR}")
 	endif()
-	target_link_libraries(${TEST_NAME} objc)
+	target_link_libraries(${TEST_NAME} ${LINK_TARGET})
 endfunction(addtest_flags)
 
-function(addtest_variants TEST TEST_SOURCE LEGACY)
-	addtest_flags(${TEST} "-O0 -fobjc-runtime=gnustep-2.2 -UNDEBUG -DGS_RUNTIME_V2" "${TEST_SOURCE}")
-	target_sources(${TEST} PRIVATE $<TARGET_OBJECTS:test_runtime>)
-	addtest_flags("${TEST}_optimised" "-O3 -fobjc-runtime=gnustep-2.2 -UNDEBUG -DGS_RUNTIME_V2" "${TEST_SOURCE}")
-	target_sources("${TEST}_optimised" PRIVATE $<TARGET_OBJECTS:test_runtime>)
+function(addtest_variants_for_target TEST TEST_SOURCE LEGACY LINK_TARGET SUFFIX)
+	addtest_flags("${TEST}${SUFFIX}" "-O0 -fobjc-runtime=gnustep-2.2 -UNDEBUG -DGS_RUNTIME_V2" "${TEST_SOURCE}" ${LINK_TARGET})
+	target_sources("${TEST}${SUFFIX}" PRIVATE $<TARGET_OBJECTS:test_runtime>)
+	addtest_flags("${TEST}_optimised${SUFFIX}" "-O3 -fobjc-runtime=gnustep-2.2 -UNDEBUG -DGS_RUNTIME_V2" "${TEST_SOURCE}" ${LINK_TARGET})
+	target_sources("${TEST}_optimised${SUFFIX}" PRIVATE $<TARGET_OBJECTS:test_runtime>)
 
 	# -fobjc-arc is not supported on platforms using the legacy runtime
 	if (${LEGACY} AND ${OLDABI_COMPAT} AND NOT ${TEST} MATCHES ".*_arc")
-		addtest_flags("${TEST}_legacy" "-O0 -fobjc-runtime=gnustep-1.7 -UNDEBUG" "${TEST_SOURCE}")
-		target_sources("${TEST}_legacy" PRIVATE $<TARGET_OBJECTS:test_runtime_legacy>)
-		addtest_flags("${TEST}_legacy_optimised" "-O3 -fobjc-runtime=gnustep-1.7 -UNDEBUG" "${TEST_SOURCE}")
-		target_sources("${TEST}_legacy_optimised" PRIVATE $<TARGET_OBJECTS:test_runtime_legacy>)
+		addtest_flags("${TEST}_legacy${SUFFIX}" "-O0 -fobjc-runtime=gnustep-1.7 -UNDEBUG" "${TEST_SOURCE}" ${LINK_TARGET})
+		target_sources("${TEST}_legacy${SUFFIX}" PRIVATE $<TARGET_OBJECTS:test_runtime_legacy>)
+		addtest_flags("${TEST}_legacy_optimised${SUFFIX}" "-O3 -fobjc-runtime=gnustep-1.7 -UNDEBUG" "${TEST_SOURCE}" ${LINK_TARGET})
+		target_sources("${TEST}_legacy_optimised${SUFFIX}" PRIVATE $<TARGET_OBJECTS:test_runtime_legacy>)
+	endif()
+endfunction(addtest_variants_for_target)
+
+function(addtest_variants TEST TEST_SOURCE LEGACY)
+	addtest_variants_for_target(${TEST} "${TEST_SOURCE}" ${LEGACY} objc "")
+	if (BUILD_STATIC_LIBOBJC)
+		addtest_variants_for_target(${TEST} "${TEST_SOURCE}" false objc-static "_static")
 	endif()
 endfunction(addtest_variants)
 
@@ -190,3 +197,7 @@ if (${LEGACY})
 	set_tests_properties(ManyManySelectors_legacy PROPERTIES PROCESSORS 3)
 	set_tests_properties(ManyManySelectors_legacy_optimised PROPERTIES PROCESSORS 3)
 endif ()
+if (BUILD_STATIC_LIBOBJC)
+	set_tests_properties(ManyManySelectors_static PROPERTIES PROCESSORS 3)
+	set_tests_properties(ManyManySelectors_optimised_static PROPERTIES PROCESSORS 3)
+endif ()