Fix errors made in merging.

Test/CMakeLists.txt

@@ -64,19 +64,19 @@ function(addtest_variants TEST TEST_SOURCE)
 	addtest_flags("${TEST}_optimised" "-O3 -fobjc-runtime=gnustep-2.0 -UNDEBUG" "${TEST_SOURCE}")
 	addtest_flags("${TEST}_legacy" "-O0 -fobjc-runtime=gnustep-1.7 -UNDEBUG" "${TEST_SOURCE}")
 	addtest_flags("${TEST}_legacy_optimised" "-O3 -fobjc-runtime=gnustep-1.7 -UNDEBUG" "${TEST_SOURCE}")
-	target_compile_definitions("${TEST}_legacy" PRIVATE SINGLE_FILE_TEST=1)
-	target_compile_definitions("${TEST}_legacy_optimised" PRIVATE SINGLE_FILE_TEST=1)
-	target_compile_definitions(${TEST} PRIVATE SINGLE_FILE_TEST=1)
-	target_compile_definitions("${TEST}_optimised" PRIVATE SINGLE_FILE_TEST=1)
 endfunction(addtest_variants)
 
 foreach(TEST_SOURCE ${TESTS})
 	get_filename_component(TEST ${TEST_SOURCE} NAME_WE)
 	addtest_variants(${TEST} ${TEST_SOURCE})
+	target_compile_definitions("${TEST}_legacy" PRIVATE SINGLE_FILE_TEST=1)
+	target_compile_definitions("${TEST}_legacy_optimised" PRIVATE SINGLE_FILE_TEST=1)
+	target_compile_definitions(${TEST} PRIVATE SINGLE_FILE_TEST=1)
+	target_compile_definitions("${TEST}_optimised" PRIVATE SINGLE_FILE_TEST=1)
 endforeach()
 
 # Tests that are more than a single file.
-addtest_variants("CXXExceptions" "CXXException.m;CXXException.cc")
+addtest_variants("CXXExceptions" "CXXException.m;CXXException.cc;Test.m")
 if (ENABLE_OBJCXX)
 addtest_variants(ObjCXXEHInterop "ObjCXXEHInterop.mm;ObjCXXEHInterop.m;Test.m")
 endif()