Fixed some CppunitTest names

Change-Id: I57b039c7114c03944e8eaba9ca1bb81da563640a

basebmp/CppunitTest_basebmp.mk

@@ -7,23 +7,23 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_CppunitTest_CppunitTest,basebmp_cpputest))
+$(eval $(call gb_CppunitTest_CppunitTest,basebmp))
 
-$(eval $(call gb_CppunitTest_use_sdk_api,basebmp_cpputest))
+$(eval $(call gb_CppunitTest_use_sdk_api,basebmp))
 
-$(eval $(call gb_CppunitTest_use_external,basebmp_cpputest,boost_headers))
+$(eval $(call gb_CppunitTest_use_external,basebmp,boost_headers))
 
-$(eval $(call gb_CppunitTest_use_libraries,basebmp_cpputest,\
+$(eval $(call gb_CppunitTest_use_libraries,basebmp,\
     basebmp \
 ))
 
-$(eval $(call gb_CppunitTest_use_libraries,basebmp_cpputest,\
+$(eval $(call gb_CppunitTest_use_libraries,basebmp,\
     basegfx \
     sal \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,basebmp_cpputest,\
+$(eval $(call gb_CppunitTest_add_exception_objects,basebmp,\
     basebmp/test/basictest \
     basebmp/test/bmpmasktest \
     basebmp/test/bmptest \

basegfx/CppunitTest_basegfx.mk

@@ -7,16 +7,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_CppunitTest_CppunitTest,basegfx_cpputest))
+$(eval $(call gb_CppunitTest_CppunitTest,basegfx))
 
-$(eval $(call gb_CppunitTest_use_external,basegfx_cpputest,boost_headers))
+$(eval $(call gb_CppunitTest_use_external,basegfx,boost_headers))
 
-$(eval $(call gb_CppunitTest_use_api,basegfx_cpputest,\
+$(eval $(call gb_CppunitTest_use_api,basegfx,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_use_libraries,basegfx_cpputest,\
+$(eval $(call gb_CppunitTest_use_libraries,basegfx,\
     basegfx \
     cppu \
     cppuhelper \
@@ -24,7 +24,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basegfx_cpputest,\
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,basegfx_cpputest,\
+$(eval $(call gb_CppunitTest_add_exception_objects,basegfx,\
     basegfx/test/basegfx1d \
     basegfx/test/basegfx2d \
     basegfx/test/basegfx3d \

odk/Module_odk.mk

@@ -52,7 +52,7 @@ $(eval $(call gb_Module_add_targets,odk,\
 endif
 
 $(eval $(call gb_Module_add_check_targets,odk,\
-	CppunitTest_checkapi \
+	CppunitTest_odk_checkapi \
 	CustomTarget_allheaders \
 	CustomTarget_check \
 ))