Fix wrong cmake configuration

- Move ADD_TEST() to CMakeLists.txt from unittest/CMakeLists.txt
- Fix wrong LD_LIBRARY_PATH environment

Change-Id: I80e325268850b38af068c226dbeebf0a08b2cce1
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 973c468..0b72eff 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,4 +36,10 @@ ENDIF(BUILD_GCOV)
 IF(BUILD_GCOV)
        ADD_DEFINITIONS("-DTIZEN_TEST_GCOV")
 ENDIF(BUILD_GCOV)
+
+SET(GTEST_TEST "gtest-alarmmgr")
 ADD_SUBDIRECTORY(unittest)
+
+ENABLE_TESTING()
+ADD_TEST(NAME ${GTEST_TEST} COMMAND ${GTEST_TEST}
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/unittest)

diff --git a/packaging/alarm-manager.spec b/packaging/alarm-manager.spec
index abb4620..e97e9d0 100644 (file)
--- a/packaging/alarm-manager.spec
+++ b/packaging/alarm-manager.spec
@@ -206,7 +206,7 @@ install -m 0644 gcov-obj/* %{buildroot}%{_datadir}/gcov/obj/%{name}
 %endif
 
 %check
-export LD_LIBRARY_PATH=lib
+export LD_LIBRARY_PATH=../lib
 ctest -V
 %if 0%{?gcov:1}
 lcov -c --ignore-errors graph --no-external -q -d . -o alarm-manager.info

diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt
index 13f5701..38f185e 100755 (executable)
--- a/unittest/CMakeLists.txt
+++ b/unittest/CMakeLists.txt
@@ -3,10 +3,6 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server)
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/mock)
 
-ENABLE_TESTING()
-
-SET(GTEST_TEST "gtest-alarmmgr")
-
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fpie")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpie")
 
@@ -34,7 +30,4 @@ LINK_DIRECTORIES(${svr_pkgs_LIBRARY_DIRS})
 ADD_EXECUTABLE(${GTEST_TEST} ${GTEST_TEST_SRCS} ${GTEST_SERVER_SRCS})
 TARGET_LINK_LIBRARIES(${GTEST_TEST} ${gtest_pkgs_LIBRARIES} ${LIBRARY} ${svr_pkgs_LIBRARIES} alarm rt)
 
-ADD_TEST(NAME ${GTEST_TEST} COMMAND ${GTEST_TEST}
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/unittest)
-
 iNSTALL(TARGETS ${GTEST_TEST} DESTINATION bin)