Test application enabled

Change-Id: Ia9f44b9e3cae53525859dda96890fc10ef1d22c7
Signed-off-by: kj7.sung <kj7.sung@samsung.com>

diff --git a/packaging/capi-location-manager.changes b/packaging/capi-location-manager.changes
index 2a85062..b756705 100644 (file)
--- a/packaging/capi-location-manager.changes
+++ b/packaging/capi-location-manager.changes
@@ -1,3 +1,9 @@
+[Version]      capi-location-manager_0.7.7
+[Date]         21 Jun 2017
+[Title]                Test application enabled
+[Developer]    Kyoungjun Sung <kj7.sung@samsung.com>
+
+================================================================================
 [Version]      capi-location-manager_0.7.6
 [Date]         2 Dec 2016
 [Title]                Fix distance based callback

diff --git a/packaging/capi-location-manager.spec b/packaging/capi-location-manager.spec
index 4bb8433..62a9ced 100644 (file)
--- a/packaging/capi-location-manager.spec
+++ b/packaging/capi-location-manager.spec
@@ -1,6 +1,6 @@
 Name: capi-location-manager
 Summary: A Location Manager library in Tizen Native API
-Version: 0.7.6
+Version: 0.7.7
 Release: 1
 Group: Location/API
 License: Apache-2.0
@@ -41,7 +41,7 @@ export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
 
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIBDIR=%{_libdir} -DINCLUDEDIR=%{_includedir} \
--DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DTZ_SYS_RO_PACKAGES=%{TZ_SYS_RO_PACKAGES} -DTZ_SYS_SHARE=%{TZ_SYS_SHARE} \
+-DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DTZ_SYS_RO_PACKAGES=%{TZ_SYS_RO_PACKAGES} -DTZ_SYS_BIN=%{TZ_SYS_BIN} \
 
 make %{?jobs:-j%jobs}
 
@@ -49,9 +49,6 @@ make %{?jobs:-j%jobs}
 rm -rf %{buildroot}
 %make_install
 
-#mkdir -p %{buildroot}/usr/share/license
-#cp LICENSE %{buildroot}/usr/share/license/%{name}
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -78,6 +75,6 @@ Test application of Location Manager
 
 %files test
 %manifest test/capi-location-manager-test.manifest
-%{TZ_SYS_RO_PACKAGES}/capi-location-manager-test.xml
-%{TZ_SYS_SHARE}/location/location_test
+#%{TZ_SYS_RO_PACKAGES}/capi-location-manager-test.xml
+%{_bindir}/location_test
 %endif

diff --git a/src/locations.c b/src/locations.c
index cc42d6c..6c2d8a0 100755 (executable)
--- a/src/locations.c
+++ b/src/locations.c
@@ -729,7 +729,7 @@ EXPORT_API int location_manager_foreach_boundary(location_manager_h manager, loc
 
 EXPORT_API int location_manager_get_method(location_manager_h manager, location_method_e *method)
 {
-       LOCATIONS_LOGD("location_manager_get_method %d", method);
+       LOCATIONS_LOGD("location_manager_get_method");
        LOCATIONS_NOT_SUPPORTED_CHECK(__is_location_supported());
        LOCATIONS_NULL_ARG_CHECK(manager);
        LOCATIONS_NULL_ARG_CHECK(method);
@@ -749,13 +749,13 @@ EXPORT_API int location_manager_get_method(location_manager_h manager, location_
                break;
        case LOCATION_METHOD_WPS:
                *method = LOCATIONS_METHOD_WPS; //LCOV_EXCL_LINE
-               break;  //LCOV_EXCL_LINE
+               break;                                                  //LCOV_EXCL_LINE
        case LOCATION_METHOD_PASSIVE:
                *method = LOCATIONS_METHOD_PASSIVE;
                break;
        default: {
-               LOCATIONS_LOGE("[LOCATIONS_ERROR_INVALID_PARAMETER] method : %d ", method);     //LCOV_EXCL_LINE
-                       return LOCATIONS_ERROR_INVALID_PARAMETER;       //LCOV_EXCL_LINE
+               LOCATIONS_LOGE("[LOCATIONS_ERROR_INVALID_PARAMETER] invalid method");   //LCOV_EXCL_LINE
+                       return LOCATIONS_ERROR_INVALID_PARAMETER;                                                       //LCOV_EXCL_LINE
                }
        }
        return LOCATIONS_ERROR_NONE;

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index a442ad9..e872c6e 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -17,5 +17,6 @@ FOREACH(src ${sources})
        TARGET_LINK_LIBRARIES(${src_name} ${fw_name} ${${fw_test}_LDFLAGS})
 ENDFOREACH()
 
-INSTALL(TARGETS ${src_name} DESTINATION ${TZ_SYS_SHARE}/location/)
-INSTALL(FILES ${fw_test}.xml DESTINATION ${TZ_SYS_RO_PACKAGES}/)
+#INSTALL(TARGETS ${src_name} DESTINATION ${TZ_SYS_SHARE}/location/)
+INSTALL(TARGETS ${src_name} DESTINATION ${TZ_SYS_BIN})
+#INSTALL(FILES ${fw_test}.xml DESTINATION ${TZ_SYS_RO_PACKAGES}/)