Fix Windows UT targets

Change-Id: Id6077a31dad30f6c71045e6d0e347b971c1484e6

Author: silvakid

test/CJUnitTestsPort/CMakeLists.txt

@@ -71,7 +71,7 @@ SET(test_CJUnitTestsPort_sources
 # It's convinient for VS users to have headers as part of project
 IF(WIN32)
   SET(test_CJUnitTestsPort_sources
-        ${tests_CJUnitTestsPort_sources}
+        ${test_CJUnitTestsPort_sources}
     BaseTestFixture.h
     ../common/stringutils.h
     resources.h
@@ -90,7 +90,7 @@ IF(WIN32)
     )
 ENDIF(WIN32)
 
-add_unit_test(CJUnitTestsPort)
+add_unit_test(CJUnitTestsPort CJUnitTestsPort)
 
 #Copy sql.properties file to build dir
 file(COPY sql.properties DESTINATION ${CMAKE_CURRENT_BINARY_DIR})

test/CMakeLists.txt

@@ -104,7 +104,7 @@ function(add_unit_test NAME)
   )
   TARGET_LINK_LIBRARIES(${TGT_NAME} ${MY_TARGET_LINK_LIBRARIES} ${MY_GCOV_LINK_LIBRARIES})
 
-  ADD_TEST(jdbc_test_${NAME} ${NAME})
+  ADD_TEST(jdbc_${TGT_NAME} ${NAME})
 
   MESSAGE(STATUS "Configuring unit tests - ${NAME}")
 

test/unit/bugs/CMakeLists.txt

@@ -34,12 +34,12 @@ SET(test_bugs_sources
 
 IF(WIN32)
   SET(test_bugs_sources
-        ${bugs_sources}
+        ${test_bugs_sources}
   bugs.h
   ../unit_fixture.h)
 
 ENDIF(WIN32)
 
-add_unit_test(bugs)
+add_unit_test(bugs bugs)
 
 MESSAGE(STATUS "Configuring bugs test cases - unsorted")