Move fota_gui_test to the tota-ua package 33/234833/1
authorKichan Kwon <k_c.kwon@samsung.com>
Fri, 29 May 2020 05:49:02 +0000 (14:49 +0900)
committerKichan Kwon <k_c.kwon@samsung.com>
Fri, 29 May 2020 06:12:46 +0000 (15:12 +0900)
- fota_gui_test is independent from wearable GUI

Change-Id: I40091e2bfad138d296a1fede2890350c5e7a6015
Signed-off-by: Kichan Kwon <k_c.kwon@samsung.com>
CMakeLists.txt
fota_gui/CMakeLists.txt
fota_gui/fota_gui_test.c [deleted file]
packaging/tota-ua.spec
scripts/40-tota-ua.list [new file with mode: 0755]
scripts/wearable/41-tota-ua.list
src/fota_gui_test.c [new file with mode: 0755]

index 22a45326c9b839788eeeb519520d52dc5260bdf2..7b6a847ca70d651db9180919088a742e9a84b726 100755 (executable)
@@ -22,6 +22,7 @@ SET(BINDIR "${PREFIX}/bin")
 SET(PKGDIR "${PREFIX}/share/fota")
 SET(RESDIR "${PKGDIR}/res")
 SET(EXECNAME "delta.ua")
+SET(FOTA_GUI_TEST "fota_gui_test")
 
 IF("${CMAKE_BUILD_TYPE}" STREQUAL "")
        SET(CMAKE_BUILD_TYPE "Release")
@@ -60,7 +61,10 @@ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed -pie")
 ADD_EXECUTABLE(${EXECNAME} ${SRCS})
 TARGET_LINK_LIBRARIES(${EXECNAME} ${pkgs_LDFLAGS})
 
+ADD_EXECUTABLE(${FOTA_GUI_TEST} src/fota_gui_test.c)
+
 INSTALL(TARGETS ${EXECNAME} DESTINATION ${BINDIR})
+INSTALL(TARGETS ${FOTA_GUI_TEST} DESTINATION ${BINDIR})
 IF("${FOTA_GUI_TYPE}" STREQUAL "GUI_TW")
        INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/wearable/images DESTINATION ${RESDIR})
        ADD_SUBDIRECTORY(fota_gui)
index c2ac309eabfd7ed245feefbfe5b9eece8cc2448e..48f3efd2d31219ee28bea3cef364214d45a54e52 100755 (executable)
@@ -5,7 +5,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(BINDIR "${PREFIX}/bin")
 SET(FOTA_GUI "fota_gui")
-SET(FOTA_GUI_TEST "fota_gui_test")
 
 
 STRING(FIND ${CMAKE_C_FLAGS} "mfloat-abi=hard" IFFOUND1)
@@ -59,7 +58,4 @@ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed -pie")
 ADD_EXECUTABLE(${FOTA_GUI} ${GUI_SRCS})
 TARGET_LINK_LIBRARIES(${FOTA_GUI} ${gui_pkgs_LDFLAGS} ${LIBS} -lpthread)
 
-ADD_EXECUTABLE(${FOTA_GUI_TEST} fota_gui_test.c)
-
 INSTALL(TARGETS ${FOTA_GUI} DESTINATION ${BINDIR})
-INSTALL(TARGETS ${FOTA_GUI_TEST} DESTINATION ${BINDIR})
diff --git a/fota_gui/fota_gui_test.c b/fota_gui/fota_gui_test.c
deleted file mode 100755 (executable)
index 5ba53ff..0000000
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * tota-ua
- *
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/un.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#define LOG(s, args...) do { printf("FOTA_GUI_TEST" "/(%s): " s, __func__, ##args); } while (0)
-
-
-#define SERV_PATH "/tmp/FotaGuiSocket"
-
-typedef struct {
-       char cmd_name[64];
-       int argc;
-       char argv[3][64];
-} sock_cmd;
-
-typedef struct {
-       int ack;
-       char ack_desc[256];
-} sock_ack;
-
-#define CMD_SUCCESS    0
-#define CMD_ERROR      -1
-#define        MISSING_PARAM   -2
-
-int sockfd = 0;
-int initcomplete = 0;
-sock_cmd *sendbuff = NULL;
-sock_ack *recvbuff = NULL;
-
-int sock_init(void)
-{
-       int len, ret;
-       struct sockaddr_un serv_addr;
-
-       LOG("%s\n", __func__);
-       sendbuff = malloc(sizeof(sock_cmd));
-       if (sendbuff == NULL) {
-               LOG("memory allocation failed:%s\n", __FUNCTION__);
-               return -1;
-       }
-
-       recvbuff = malloc(sizeof(sock_ack));
-       if (recvbuff == NULL) {
-               LOG("memory allocation failed:%s\n", __FUNCTION__);
-               return -1;
-       }
-
-       sockfd = socket(AF_UNIX, SOCK_STREAM, 0);
-       if (sockfd < 0) {
-               perror("\n Error : socket Failed \n");
-               return -1;
-       }
-       bzero((char *)&serv_addr, sizeof(serv_addr));
-       serv_addr.sun_family = AF_UNIX;
-       strncpy(serv_addr.sun_path, SERV_PATH, sizeof(serv_addr.sun_path) - 1);
-       len = sizeof(serv_addr);
-
-       ret = connect(sockfd, (struct sockaddr *)&serv_addr, len);
-       if (ret < 0) {
-               LOG("\n Error : Connect Failed \n");
-               return -1;
-       }
-
-       initcomplete = 1;
-       return ret;
-}
-
-void sock_deinit(void)
-{
-       LOG("%s\n", __func__);
-
-       close(sockfd);
-       free(sendbuff);
-       free(recvbuff);
-       initcomplete = 0;
-}
-
-int sock_cmd_progress(int percent_progress)
-{
-       int result = 0;
-
-       LOG("%s \n", __func__);
-       if (!initcomplete) {
-               LOG("sock_init unsuccessful \n");
-               return -1;
-       }
-
-       memset(sendbuff, 0, sizeof(sock_cmd));
-       memset(recvbuff, 0xFF, sizeof(sock_ack));
-
-       strncpy(sendbuff->cmd_name, "draw_progress", 63);
-       sendbuff->argc = 1;
-       snprintf(sendbuff->argv[0], 63, "%d", percent_progress);
-       LOG("sendbuff->argv[0] = %s \n", sendbuff->argv[0]);
-
-       result = write(sockfd, sendbuff, sizeof(sock_cmd));
-       if (result < 0) {
-               LOG(" Write Failed! \n");
-               return -1;
-       }
-
-       result = read(sockfd, recvbuff, sizeof(sock_ack));
-       recvbuff->ack_desc[255] = 0x00;
-       if (recvbuff->ack != CMD_SUCCESS || result < 0) {
-               LOG(" Fail %s ret(%d)\n", recvbuff->ack_desc, recvbuff->ack);
-               return -1;
-       } else
-               LOG("%s ret(%d)\n", recvbuff->ack_desc, recvbuff->ack);
-
-       return recvbuff->ack;
-}
-
-int sock_cmd_end(void)
-{
-       int result = 0;
-
-       LOG("%s \n", __func__);
-       if (!initcomplete) {
-               LOG("sock_init unsuccessful \n");
-               return -1;
-       }
-
-       memset(sendbuff, 0, sizeof(sock_cmd));
-       memset(recvbuff, 0xFF, sizeof(sock_ack));
-
-       strncpy(sendbuff->cmd_name, "draw_end", 63);
-       sendbuff->argc = 0;
-
-       result = write(sockfd, sendbuff, sizeof(sock_cmd));
-       if (result < 0) {
-               LOG(" Write Failed! \n");
-               return -1;
-       }
-
-       result = read(sockfd, recvbuff, sizeof(sock_ack));
-       recvbuff->ack_desc[255] = 0x00;
-       if (recvbuff->ack != CMD_SUCCESS || result < 0) {
-               LOG(" Fail %s ret(%d)\n", recvbuff->ack_desc, recvbuff->ack);
-               return -1;
-       } else
-               LOG("%s ret(%d)\n", recvbuff->ack_desc, recvbuff->ack);
-
-       return recvbuff->ack;
-}
-
-int main(int argc, char **argv)
-{
-       int ret;
-       int percent = 0;
-
-       if (argc != 2) {
-               LOG("Invalid argc = %d\n", argc);
-               return -1;
-       }
-
-       if (sock_init() < 0) {
-               LOG("sock_init() failed\n");
-               return -1;
-       }
-
-       percent = atoi(argv[1]);
-       if (percent == -1)
-               ret = sock_cmd_end();
-       else
-               ret = sock_cmd_progress(percent);
-       LOG("ret = %d\n", ret);
-
-       sock_deinit();
-
-       return 0;
-}
-
-
index cabb365679409591f3218948e644e2e9b41a8c71..9ace3bf54666a4bef430244b49eb09b4e57c7138 100755 (executable)
@@ -57,6 +57,8 @@ make %{?jobs:-j%jobs}
 %make_install
 mv %{buildroot}%{_datadir}/fota/res/images %{buildroot}%{_datadir}/fota/res/images_wearable
 mkdir -p %{buildroot}%{_datadir}/initrd-recovery/initrd.list.d
+cp scripts/40-tota-ua.list \
+          %{buildroot}%{_datadir}/initrd-recovery/initrd.list.d/40-tota-ua.list
 cp scripts/wearable/41-tota-ua.list \
           %{buildroot}%{_datadir}/initrd-recovery/initrd.list.d/41-tota-ua.list.wearable
 
@@ -86,13 +88,14 @@ mv %{_datadir}/initrd-recovery/initrd.list.d/41-tota-ua.list.wearable \
 %defattr(-,root,root,-)
 %{_bindir}/delta.ua
 %{_bindir}/upgrade-trigger.sh
+%attr(700,-,-) %{_datadir}/initrd-recovery/initrd.list.d/40-tota-ua.list
+%{_bindir}/fota_gui_test
 
 %files target_wearable
 %defattr(-,root,root,-)
 %attr(700,-,-) %{_datadir}/initrd-recovery/initrd.list.d/41-tota-ua.list.wearable
 %{_datadir}/fota/res/images_wearable
 %{_bindir}/fota_gui
-%{_bindir}/fota_gui_test
 
 %files -n update-helper-service
 %{_bindir}/update-helper
diff --git a/scripts/40-tota-ua.list b/scripts/40-tota-ua.list
new file mode 100755 (executable)
index 0000000..d8739cf
--- /dev/null
@@ -0,0 +1,4 @@
+# ---- Target contents ----------------------------------------------------- #
+WITHLIBS="
+/usr/bin/fota_gui_test
+"
index 8d340e73b932da0ced164b4d0bee64a0b614ef17..6e4581646b87b07b82ef696e29d35b4edc26e785 100755 (executable)
@@ -119,7 +119,6 @@ VERBATIMS="
 
 WITHLIBS="
 /usr/bin/fota_gui
-/usr/bin/fota_gui_test
 /usr/lib/tdm/libtdm-default.so
 /usr/lib/bufmgr/libtbm_default.so
 "
diff --git a/src/fota_gui_test.c b/src/fota_gui_test.c
new file mode 100755 (executable)
index 0000000..5ba53ff
--- /dev/null
@@ -0,0 +1,199 @@
+/*
+ * tota-ua
+ *
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#define LOG(s, args...) do { printf("FOTA_GUI_TEST" "/(%s): " s, __func__, ##args); } while (0)
+
+
+#define SERV_PATH "/tmp/FotaGuiSocket"
+
+typedef struct {
+       char cmd_name[64];
+       int argc;
+       char argv[3][64];
+} sock_cmd;
+
+typedef struct {
+       int ack;
+       char ack_desc[256];
+} sock_ack;
+
+#define CMD_SUCCESS    0
+#define CMD_ERROR      -1
+#define        MISSING_PARAM   -2
+
+int sockfd = 0;
+int initcomplete = 0;
+sock_cmd *sendbuff = NULL;
+sock_ack *recvbuff = NULL;
+
+int sock_init(void)
+{
+       int len, ret;
+       struct sockaddr_un serv_addr;
+
+       LOG("%s\n", __func__);
+       sendbuff = malloc(sizeof(sock_cmd));
+       if (sendbuff == NULL) {
+               LOG("memory allocation failed:%s\n", __FUNCTION__);
+               return -1;
+       }
+
+       recvbuff = malloc(sizeof(sock_ack));
+       if (recvbuff == NULL) {
+               LOG("memory allocation failed:%s\n", __FUNCTION__);
+               return -1;
+       }
+
+       sockfd = socket(AF_UNIX, SOCK_STREAM, 0);
+       if (sockfd < 0) {
+               perror("\n Error : socket Failed \n");
+               return -1;
+       }
+       bzero((char *)&serv_addr, sizeof(serv_addr));
+       serv_addr.sun_family = AF_UNIX;
+       strncpy(serv_addr.sun_path, SERV_PATH, sizeof(serv_addr.sun_path) - 1);
+       len = sizeof(serv_addr);
+
+       ret = connect(sockfd, (struct sockaddr *)&serv_addr, len);
+       if (ret < 0) {
+               LOG("\n Error : Connect Failed \n");
+               return -1;
+       }
+
+       initcomplete = 1;
+       return ret;
+}
+
+void sock_deinit(void)
+{
+       LOG("%s\n", __func__);
+
+       close(sockfd);
+       free(sendbuff);
+       free(recvbuff);
+       initcomplete = 0;
+}
+
+int sock_cmd_progress(int percent_progress)
+{
+       int result = 0;
+
+       LOG("%s \n", __func__);
+       if (!initcomplete) {
+               LOG("sock_init unsuccessful \n");
+               return -1;
+       }
+
+       memset(sendbuff, 0, sizeof(sock_cmd));
+       memset(recvbuff, 0xFF, sizeof(sock_ack));
+
+       strncpy(sendbuff->cmd_name, "draw_progress", 63);
+       sendbuff->argc = 1;
+       snprintf(sendbuff->argv[0], 63, "%d", percent_progress);
+       LOG("sendbuff->argv[0] = %s \n", sendbuff->argv[0]);
+
+       result = write(sockfd, sendbuff, sizeof(sock_cmd));
+       if (result < 0) {
+               LOG(" Write Failed! \n");
+               return -1;
+       }
+
+       result = read(sockfd, recvbuff, sizeof(sock_ack));
+       recvbuff->ack_desc[255] = 0x00;
+       if (recvbuff->ack != CMD_SUCCESS || result < 0) {
+               LOG(" Fail %s ret(%d)\n", recvbuff->ack_desc, recvbuff->ack);
+               return -1;
+       } else
+               LOG("%s ret(%d)\n", recvbuff->ack_desc, recvbuff->ack);
+
+       return recvbuff->ack;
+}
+
+int sock_cmd_end(void)
+{
+       int result = 0;
+
+       LOG("%s \n", __func__);
+       if (!initcomplete) {
+               LOG("sock_init unsuccessful \n");
+               return -1;
+       }
+
+       memset(sendbuff, 0, sizeof(sock_cmd));
+       memset(recvbuff, 0xFF, sizeof(sock_ack));
+
+       strncpy(sendbuff->cmd_name, "draw_end", 63);
+       sendbuff->argc = 0;
+
+       result = write(sockfd, sendbuff, sizeof(sock_cmd));
+       if (result < 0) {
+               LOG(" Write Failed! \n");
+               return -1;
+       }
+
+       result = read(sockfd, recvbuff, sizeof(sock_ack));
+       recvbuff->ack_desc[255] = 0x00;
+       if (recvbuff->ack != CMD_SUCCESS || result < 0) {
+               LOG(" Fail %s ret(%d)\n", recvbuff->ack_desc, recvbuff->ack);
+               return -1;
+       } else
+               LOG("%s ret(%d)\n", recvbuff->ack_desc, recvbuff->ack);
+
+       return recvbuff->ack;
+}
+
+int main(int argc, char **argv)
+{
+       int ret;
+       int percent = 0;
+
+       if (argc != 2) {
+               LOG("Invalid argc = %d\n", argc);
+               return -1;
+       }
+
+       if (sock_init() < 0) {
+               LOG("sock_init() failed\n");
+               return -1;
+       }
+
+       percent = atoi(argv[1]);
+       if (percent == -1)
+               ret = sock_cmd_end();
+       else
+               ret = sock_cmd_progress(percent);
+       LOG("ret = %d\n", ret);
+
+       sock_deinit();
+
+       return 0;
+}
+
+