From 1b0b0d5a38fb1ef17688d6545c1970e40b9dd6fd Mon Sep 17 00:00:00 2001 From: InHong Han Date: Fri, 21 May 2021 17:20:41 +0900 Subject: [PATCH 01/16] Fix issue detected by static analysis tool double_free: Calling g_variant_iter_free frees pointer info_iter which has already been freed. pass_freed_arg: Passing freed pointer keyword_iter as an argument to g_variant_iter_free. Change-Id: I9517519228317fbf921f5bef60641146c20ff72d --- client/src/sticker_dbus.c | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/client/src/sticker_dbus.c b/client/src/sticker_dbus.c index 75c1a89..a36cfaa 100644 --- a/client/src/sticker_dbus.c +++ b/client/src/sticker_dbus.c @@ -179,13 +179,6 @@ static void _handle_sticker_consumer_cb(GDBusConnection *connection, g_variant_get(parameters, "(ia{iv}a(s))", &event_type, &info_iter, &keyword_iter); _get_sticker_info_from_gvariant(info_iter, keyword_iter, sticker_data); consumer_handle->event_cb((sticker_consumer_event_type_e)event_type, sticker_data, consumer_handle->event_cb_user_data); - - if (info_iter) - g_variant_iter_free(info_iter); - - if (keyword_iter) - g_variant_iter_free(keyword_iter); - sticker_data_destroy(sticker_data); } } @@ -619,12 +612,6 @@ int sticker_dbus_update_sticker_info(GDBusConnection *gdbus_connection, sticker_ g_variant_get(reply_body, "(a{iv}a(s))", &info_iter, &keyword_iter); _get_sticker_info_from_gvariant(info_iter, keyword_iter, origin_data); - - if (info_iter) - g_variant_iter_free(info_iter); - - if (keyword_iter) - g_variant_iter_free(keyword_iter); } else { LOGW("failed to get sticker info"); free(origin_data); @@ -781,12 +768,6 @@ int sticker_dbus_get_sticker_info_by_record_id(GDBusConnection *gdbus_connection if (reply_body) g_variant_unref(reply_body); - - if (info_iter) - g_variant_iter_free(info_iter); - - if (keyword_iter) - g_variant_iter_free(keyword_iter); } if (reply) @@ -1132,12 +1113,6 @@ int sticker_dbus_get_sticker_info_by_uri(GDBusConnection *gdbus_connection, stic if (reply_body) g_variant_unref(reply_body); - - if (info_iter) - g_variant_iter_free(info_iter); - - if (keyword_iter) - g_variant_iter_free(keyword_iter); } if (reply) -- 2.7.4 From 5c47ae67baccdadbe490d894079e2a014dd37e5a Mon Sep 17 00:00:00 2001 From: InHong Han Date: Fri, 21 May 2021 17:22:56 +0900 Subject: [PATCH 02/16] Update package version to 0.1.77 Change-Id: I58d8623a5fd6bf4a28e093ce513f23094e0ce800 --- packaging/capi-ui-sticker.spec | 2 +- receiver/tizen-manifest.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/capi-ui-sticker.spec b/packaging/capi-ui-sticker.spec index 564e95b..842f64e 100644 --- a/packaging/capi-ui-sticker.spec +++ b/packaging/capi-ui-sticker.spec @@ -1,6 +1,6 @@ Name: capi-ui-sticker Summary: Sticker client library and daemon -Version: 0.1.76 +Version: 0.1.77 Release: 1 Group: Graphics & UI Framework/Input License: Apache-2.0 diff --git a/receiver/tizen-manifest.xml b/receiver/tizen-manifest.xml index e3ec8e9..32057c9 100644 --- a/receiver/tizen-manifest.xml +++ b/receiver/tizen-manifest.xml @@ -1,5 +1,5 @@ - + -- 2.7.4 From a53c9df27d5b04334b4b2e6dac044403bdfee40b Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Mon, 6 Sep 2021 09:52:26 +0900 Subject: [PATCH 03/16] Fix issue detected by static analysis tool Change-Id: I44ca1ca13b33e9f6dc014a7700fca22f4f7322b1 Signed-off-by: Jihoon Kim --- server/stickerd_data_manager.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/server/stickerd_data_manager.c b/server/stickerd_data_manager.c index 3210959..ac976f2 100644 --- a/server/stickerd_data_manager.c +++ b/server/stickerd_data_manager.c @@ -862,6 +862,7 @@ int stickerd_insert_sticker_info_by_json(GVariant *parameters, GVariant **reply_ JsonArray *keyword_arr = NULL; int arr_len = 0; int keyword_arr_len = 0; + const char *keyword = NULL; JsonNode *root = NULL; JsonObject *root_obj = NULL; @@ -967,7 +968,9 @@ int stickerd_insert_sticker_info_by_json(GVariant *parameters, GVariant **reply_ goto free_memory; for (int j = 0; j < keyword_arr_len; j++) { - sticker_info->keyword = g_list_append(sticker_info->keyword, strdup((const char *)json_array_get_string_element(keyword_arr, j))); + keyword = json_array_get_string_element(keyword_arr, j); + if (keyword) + sticker_info->keyword = g_list_append(sticker_info->keyword, strdup(keyword)); } ret = stickerd_db_insert_sticker_info(&record_id, sticker_info); @@ -1898,4 +1901,4 @@ int stickerd_get_group_image_list(GVariant *parameters, GVariant **reply_body) } return ret; -} \ No newline at end of file +} -- 2.7.4 From 0b7854c07e132af8df0b8b864fa3e63aa4dd5ead Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Mon, 6 Sep 2021 09:55:20 +0900 Subject: [PATCH 04/16] Update package version to 0.1.78 Change-Id: I098e1947801f6bcb6d7c15c2b0527de3409fff33 Signed-off-by: Jihoon Kim --- packaging/capi-ui-sticker.spec | 2 +- receiver/tizen-manifest.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/capi-ui-sticker.spec b/packaging/capi-ui-sticker.spec index 842f64e..8d2b693 100644 --- a/packaging/capi-ui-sticker.spec +++ b/packaging/capi-ui-sticker.spec @@ -1,6 +1,6 @@ Name: capi-ui-sticker Summary: Sticker client library and daemon -Version: 0.1.77 +Version: 0.1.78 Release: 1 Group: Graphics & UI Framework/Input License: Apache-2.0 diff --git a/receiver/tizen-manifest.xml b/receiver/tizen-manifest.xml index 32057c9..da652b6 100644 --- a/receiver/tizen-manifest.xml +++ b/receiver/tizen-manifest.xml @@ -1,5 +1,5 @@ - + -- 2.7.4 From 2a43d2e836b607c44fb0db38e01133c131f9d9f2 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Tue, 12 Oct 2021 13:57:35 +0900 Subject: [PATCH 05/16] Fix build error in sticker-receiver Change-Id: I8131bc527af046aaff894ea8884a8e38167106e2 Signed-off-by: Jihoon Kim --- receiver/inc/ft.h | 4 ++++ receiver/src/main.cpp | 1 + 2 files changed, 5 insertions(+) diff --git a/receiver/inc/ft.h b/receiver/inc/ft.h index f3a735c..7421840 100644 --- a/receiver/inc/ft.h +++ b/receiver/inc/ft.h @@ -16,6 +16,8 @@ #include +#include "sticker_request.h" + #ifndef __FT_H__ #define __FT_H__ @@ -39,4 +41,6 @@ bool request_show_sync_notification(); bool get_job_progress(); +void push_sticker_request(request_type req_type, const char *mode, const char *category, const char *type); + #endif /* __FT_H__ */ diff --git a/receiver/src/main.cpp b/receiver/src/main.cpp index 968b4f4..12cf6a2 100644 --- a/receiver/src/main.cpp +++ b/receiver/src/main.cpp @@ -30,6 +30,7 @@ #include "config.h" #include "receiver_preference.h" #include "sticker_info.h" +#include "sticker_request.h" using namespace std; -- 2.7.4 From 987e86f3b8cf1a540b5c032a15bcf83eb1bd5c53 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Tue, 12 Oct 2021 19:03:40 +0900 Subject: [PATCH 06/16] Fix typo in receiver Change-Id: I1e55f56ec55429a3075985fe1bb1370cc87c59e2 Signed-off-by: Jihoon Kim --- receiver/src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/receiver/src/main.cpp b/receiver/src/main.cpp index 12cf6a2..1363791 100644 --- a/receiver/src/main.cpp +++ b/receiver/src/main.cpp @@ -183,7 +183,7 @@ static void process_request(app_control_h app_control, char *request) if (!is_init_sap()) initialize_sap(); request_all_sticker_data(mode, type); - } else { // Under the sync interval time. Need to check whether last sync was succeded or not. + } else { // Under the sync interval time. Need to check whether last sync was succeeded or not. int last_sync_status = 0; if (preference_get_int(LAST_SYNC_STATUS, &last_sync_status) != PREFERENCE_ERROR_NONE) { -- 2.7.4 From b55547f4a39963b9d5722b54beb419529ba91964 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Fri, 7 Jan 2022 13:32:40 +0900 Subject: [PATCH 07/16] Improve log Change-Id: I06cc3d0864ff712c8dff445a91fcfb9b26c1461e Signed-off-by: Jihoon Kim --- receiver/src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/receiver/src/main.cpp b/receiver/src/main.cpp index 1363791..f2d7d82 100644 --- a/receiver/src/main.cpp +++ b/receiver/src/main.cpp @@ -384,7 +384,7 @@ int main(int argc, char *argv[]) ret = service_app_main(argc, argv, &event_callback, NULL); if (ret != APP_ERROR_NONE) { - STLOGE("app_main() is failed. err = %d", ret); + STLOGE("service_app_main() is failed. err = %d", ret); } return ret; } -- 2.7.4 From 2e3d9421756738a659b3f68f31074ed72def323f Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Wed, 12 Jan 2022 10:50:34 +0900 Subject: [PATCH 08/16] Fix double close issue Handler 'db' is passed to a function at sticker-parser.c:884 by calling function 'sqlite3_close' after the handler is closed again at sticker-parser.c:861 by calling function 'sqlite3_close'. Handler 'stmt' is passed to a function at sticker-parser.c:842 by calling function 'sqlite3_finalize' after the handler is closed again at sticker-parser.c:819 by calling function 'sqlite3_finalize'. Change-Id: I969482a8713925dcf4539d70717f132d74cf987b Signed-off-by: Jihoon Kim --- sticker-parser/sticker-parser.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/sticker-parser/sticker-parser.c b/sticker-parser/sticker-parser.c index 321e141..20bd406 100644 --- a/sticker-parser/sticker-parser.c +++ b/sticker-parser/sticker-parser.c @@ -775,8 +775,6 @@ static void __delete_sticker_allowlist(const char *db_path, const char *app_id) ret = sqlite3_prepare_v2(db, "DELETE FROM sticker_whitelist_info WHERE provider_id = ?", -1, &stmt, NULL); if (ret != SQLITE_OK) { LOGE("failed to delete sticker allowlist : %s", sqlite3_errmsg(db)); - sqlite3_finalize(stmt); - sqlite3_close(db); goto cleanup; } @@ -816,8 +814,6 @@ static void __delete_sticker_info(const char *db_path, int record_id) ret = sqlite3_prepare_v2(db, "DELETE FROM sticker_info WHERE sticker_info_id = ?", -1, &stmt, NULL); if (ret != SQLITE_OK) { LOGE("failed to delete sticker information : %s", sqlite3_errmsg(db)); - sqlite3_finalize(stmt); - sqlite3_close(db); goto cleanup; } @@ -857,8 +853,6 @@ static void __delete_group_info(const char *db_path, const char *app_id) ret = sqlite3_prepare_v2(db, "DELETE FROM sticker_group_info WHERE app_id = ?", -1, &stmt, NULL); if (ret != SQLITE_OK) { LOGE("failed to delete group information : %s", sqlite3_errmsg(db)); - sqlite3_finalize(stmt); - sqlite3_close(db); goto cleanup; } @@ -1109,4 +1103,4 @@ int PKGMGR_CATEGORY_PARSER_PLUGIN_UPGRADE(const char *pkgid, const char *appid, PKGMGR_CATEGORY_PARSER_PLUGIN_INSTALL(pkgid, appid, list); return 0; -} \ No newline at end of file +} -- 2.7.4 From ee4da17a7e3c65d96f17daba079ca67e6f300d11 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Wed, 12 Jan 2022 10:58:51 +0900 Subject: [PATCH 09/16] Update package version to 1.2.1 Change-Id: I4c5f5b4d73818f90db568553162bfc52d21bd26f Signed-off-by: Jihoon Kim --- packaging/capi-ui-sticker.spec | 2 +- receiver/tizen-manifest.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/capi-ui-sticker.spec b/packaging/capi-ui-sticker.spec index 8d2b693..f4f9be1 100644 --- a/packaging/capi-ui-sticker.spec +++ b/packaging/capi-ui-sticker.spec @@ -1,6 +1,6 @@ Name: capi-ui-sticker Summary: Sticker client library and daemon -Version: 0.1.78 +Version: 1.2.1 Release: 1 Group: Graphics & UI Framework/Input License: Apache-2.0 diff --git a/receiver/tizen-manifest.xml b/receiver/tizen-manifest.xml index da652b6..1e545ab 100644 --- a/receiver/tizen-manifest.xml +++ b/receiver/tizen-manifest.xml @@ -1,5 +1,5 @@ - + -- 2.7.4 From b23cdc99b3f3f66912362ab58c6f7c8f6c3309d7 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Thu, 20 Jan 2022 22:47:05 +0900 Subject: [PATCH 10/16] Change directory for gcov Change-Id: Ie91cc69f657a562e26ef3fb116daa152115deefa Signed-off-by: Jihoon Kim --- packaging/capi-ui-sticker.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/capi-ui-sticker.spec b/packaging/capi-ui-sticker.spec index f4f9be1..600241e 100644 --- a/packaging/capi-ui-sticker.spec +++ b/packaging/capi-ui-sticker.spec @@ -140,8 +140,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d install -m 0644 %SOURCE3 %{buildroot}%{_sysconfdir}/dbus-1/system.d/capi-ui-sticker.conf %if 0%{?gcov:1} -install -d -m 755 %{buildroot}%{_datadir}/gcov/obj -tar xf %{name}-gcov.tar -C %{buildroot}%{_datadir}/gcov/obj +install -d -m 755 %{buildroot}%{_datadir}/gcov/obj/%{name} +tar xf %{name}-gcov.tar -C %{buildroot}%{_datadir}/gcov/obj/%{name} %endif %if 0%{?sec_product_feature_profile_wearable} -- 2.7.4 From c7b2720a6746aeed81b4d3494bc77f56eb684d8d Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Sun, 23 Jan 2022 08:18:16 +0900 Subject: [PATCH 11/16] Update package version to 1.2.2 Change-Id: Ia09a93df6d1897a2ed041d628bb49d7d5e7ebf07 Signed-off-by: Jihoon Kim --- packaging/capi-ui-sticker.spec | 2 +- receiver/tizen-manifest.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/capi-ui-sticker.spec b/packaging/capi-ui-sticker.spec index 600241e..ec59009 100644 --- a/packaging/capi-ui-sticker.spec +++ b/packaging/capi-ui-sticker.spec @@ -1,6 +1,6 @@ Name: capi-ui-sticker Summary: Sticker client library and daemon -Version: 1.2.1 +Version: 1.2.2 Release: 1 Group: Graphics & UI Framework/Input License: Apache-2.0 diff --git a/receiver/tizen-manifest.xml b/receiver/tizen-manifest.xml index 1e545ab..d3835c5 100644 --- a/receiver/tizen-manifest.xml +++ b/receiver/tizen-manifest.xml @@ -1,5 +1,5 @@ - + -- 2.7.4 From 07999bf1c9a43462b0fd5de42fc0f45a2405654c Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Thu, 27 Jan 2022 06:16:28 +0900 Subject: [PATCH 12/16] Change gtest name and path Change-Id: I5045888543c05bd095e7f6b282e4e56402a61d92 Signed-off-by: Jihoon Kim --- CMakeLists.txt | 2 +- packaging/capi-ui-sticker.spec | 2 +- tests/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4279bb2..16ad375 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,7 +54,7 @@ ENDIF() ## Test ENABLE_TESTING() -SET(UTC_STICKER sticker_unittests) +SET(UTC_STICKER capi-ui-sticker_gtest) ADD_TEST(NAME ${UTC_STICKER} COMMAND ${UTC_STICKER} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests) ADD_SUBDIRECTORY(tests) diff --git a/packaging/capi-ui-sticker.spec b/packaging/capi-ui-sticker.spec index ec59009..1e62609 100644 --- a/packaging/capi-ui-sticker.spec +++ b/packaging/capi-ui-sticker.spec @@ -208,7 +208,7 @@ chsmack -a "User::App::Shared" /opt/usr/share/sticker-data %files unittests %license LICENSE -%{_bindir}/sticker_unittests +%{_libdir}/%{name}/* %if 0%{?gcov:1} %files gcov diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index eea11f2..031b15f 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -28,4 +28,4 @@ ADD_EXECUTABLE(${UTC_STICKER} ) TARGET_LINK_LIBRARIES(${UTC_STICKER} ${GTEST_LIBRARIES} ${pkgs_LDFLAGS} ${EXTRA_LDFLAGS}) -INSTALL(TARGETS ${UTC_STICKER} DESTINATION /usr/bin) +INSTALL(TARGETS ${UTC_STICKER} DESTINATION ${LIBDIR}/capi-ui-sticker/unittest) -- 2.7.4 From 4c1c28f827517c935a503f6a064b6f8540f08aa7 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Fri, 28 Jan 2022 01:00:50 +0900 Subject: [PATCH 13/16] Update package version to 1.2.3 Change-Id: I7c58e2fe9b6bdcb340109f6faf6aeb8207e5d089 Signed-off-by: Jihoon Kim --- packaging/capi-ui-sticker.spec | 2 +- receiver/tizen-manifest.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/capi-ui-sticker.spec b/packaging/capi-ui-sticker.spec index 1e62609..735a7b8 100644 --- a/packaging/capi-ui-sticker.spec +++ b/packaging/capi-ui-sticker.spec @@ -1,6 +1,6 @@ Name: capi-ui-sticker Summary: Sticker client library and daemon -Version: 1.2.2 +Version: 1.2.3 Release: 1 Group: Graphics & UI Framework/Input License: Apache-2.0 diff --git a/receiver/tizen-manifest.xml b/receiver/tizen-manifest.xml index d3835c5..98336a4 100644 --- a/receiver/tizen-manifest.xml +++ b/receiver/tizen-manifest.xml @@ -1,5 +1,5 @@ - + -- 2.7.4 From b8ae858d2164c480cc806d7bcda3887f93e79d92 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Tue, 17 May 2022 15:22:08 +0900 Subject: [PATCH 14/16] Apply new gcov policy - Apply of tree type gcov structure - Create run-unittest.sh - Change the unittest path and name Change-Id: I3eefa3045cd81a7f16a35f4fcec0f150e6b42456 Signed-off-by: Jihoon Kim --- CMakeLists.txt | 2 +- packaging/capi-ui-sticker.spec | 44 +++++++++++++++++++++++++++++++++--------- tests/CMakeLists.txt | 2 +- 3 files changed, 37 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 16ad375..22c7a24 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,7 +54,7 @@ ENDIF() ## Test ENABLE_TESTING() -SET(UTC_STICKER capi-ui-sticker_gtest) +SET(UTC_STICKER capi-ui-sticker-unittest) ADD_TEST(NAME ${UTC_STICKER} COMMAND ${UTC_STICKER} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests) ADD_SUBDIRECTORY(tests) diff --git a/packaging/capi-ui-sticker.spec b/packaging/capi-ui-sticker.spec index 735a7b8..4158f54 100644 --- a/packaging/capi-ui-sticker.spec +++ b/packaging/capi-ui-sticker.spec @@ -119,14 +119,45 @@ export FFLAGS+=" -DTIZEN_DEBUG_ENABLE -fvisibility=hidden" make %{?jobs:-j%jobs} -%if 0%{?gcov:1} -find . -name '*.gcno' | tar cf %{name}-gcov.tar -T - -%endif %install rm -rf %{buildroot} %make_install +%if 0%{?gcov:1} +builddir=$(basename $PWD) +gcno_obj_dir=%{buildroot}%{_datadir}/gcov/obj/%{name}/"$builddir" +mkdir -p "$gcno_obj_dir" +find . -name '*.gcno' -exec cp --parents '{}' "$gcno_obj_dir" ';' +%endif + +cat << EOF > run-unittest.sh +#!/bin/sh +setup() { + echo "setup start" +} + +test_main() { + echo "test_main start" + /usr/bin/capi-ui-sticker-unittest +} + +teardown() { + echo "teardown start" +} + +main() { + setup + test_main + teardown +} + +main "\$*" +EOF + +mkdir -p %{buildroot}%{_bindir}/tizen-unittests/%{name} +install -m 0755 run-unittest.sh %{buildroot}%{_bindir}/tizen-unittests/%{name} + mkdir -p %{buildroot}/%{TZ_SYS_ETC}/dump.d/module.d cp -af dump/sticker_log_dump.sh %{buildroot}/%{TZ_SYS_ETC}/dump.d/module.d @@ -139,11 +170,6 @@ install -m 0644 %SOURCE2 %{buildroot}%{_datadir}/dbus-1/system-services/org.tize mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d install -m 0644 %SOURCE3 %{buildroot}%{_sysconfdir}/dbus-1/system.d/capi-ui-sticker.conf -%if 0%{?gcov:1} -install -d -m 755 %{buildroot}%{_datadir}/gcov/obj/%{name} -tar xf %{name}-gcov.tar -C %{buildroot}%{_datadir}/gcov/obj/%{name} -%endif - %if 0%{?sec_product_feature_profile_wearable} %define tizen_sign 1 %define tizen_sign_base %{TZ_SYS_RO_APP}/%{_companion_app_name} @@ -208,7 +234,7 @@ chsmack -a "User::App::Shared" /opt/usr/share/sticker-data %files unittests %license LICENSE -%{_libdir}/%{name}/* +%{_bindir}/* %if 0%{?gcov:1} %files gcov diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 031b15f..7e877ef 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -28,4 +28,4 @@ ADD_EXECUTABLE(${UTC_STICKER} ) TARGET_LINK_LIBRARIES(${UTC_STICKER} ${GTEST_LIBRARIES} ${pkgs_LDFLAGS} ${EXTRA_LDFLAGS}) -INSTALL(TARGETS ${UTC_STICKER} DESTINATION ${LIBDIR}/capi-ui-sticker/unittest) +INSTALL(TARGETS ${UTC_STICKER} DESTINATION ${BINDIR}) -- 2.7.4 From a6dd3c25665efd30b368a13b85473788a76bcefc Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Tue, 24 May 2022 19:25:06 +0900 Subject: [PATCH 15/16] Update package version to 1.2.4 Change-Id: I168d781b7924f18f479d26562b9cb10e36811b6f Signed-off-by: Jihoon Kim --- packaging/capi-ui-sticker.spec | 2 +- receiver/tizen-manifest.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/capi-ui-sticker.spec b/packaging/capi-ui-sticker.spec index 4158f54..c9f35ae 100644 --- a/packaging/capi-ui-sticker.spec +++ b/packaging/capi-ui-sticker.spec @@ -1,6 +1,6 @@ Name: capi-ui-sticker Summary: Sticker client library and daemon -Version: 1.2.3 +Version: 1.2.4 Release: 1 Group: Graphics & UI Framework/Input License: Apache-2.0 diff --git a/receiver/tizen-manifest.xml b/receiver/tizen-manifest.xml index 98336a4..e94020b 100644 --- a/receiver/tizen-manifest.xml +++ b/receiver/tizen-manifest.xml @@ -1,5 +1,5 @@ - + -- 2.7.4 From e75cbd1524a716430523f6780968f46c538ceb89 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Mon, 13 Jun 2022 14:00:41 +0900 Subject: [PATCH 16/16] Fix wrong file install in unittest package Change-Id: I9623ef1bfd5009999c0763f49d8c07419ccae17d Signed-off-by: Jihoon Kim --- packaging/capi-ui-sticker.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packaging/capi-ui-sticker.spec b/packaging/capi-ui-sticker.spec index c9f35ae..5088b4b 100644 --- a/packaging/capi-ui-sticker.spec +++ b/packaging/capi-ui-sticker.spec @@ -234,7 +234,8 @@ chsmack -a "User::App::Shared" /opt/usr/share/sticker-data %files unittests %license LICENSE -%{_bindir}/* +%{_bindir}/capi-ui-sticker-unittest +%{_bindir}/tizen-unittests/* %if 0%{?gcov:1} %files gcov -- 2.7.4