ecore_con: fix resource path

Change-Id: Id366e3b32893212a79801b883e9d214147229156

diff --git a/TC/ecore/ecore_con/utc_ecore_con_ssl.c b/TC/ecore/ecore_con/utc_ecore_con_ssl.c
index b38ad7256152f2bc3005306a309ad5bf7ce3531c..8fc01c6154a1878f1d41d4d2c39eb77b761d499d 100644 (file)
--- a/TC/ecore/ecore_con/utc_ecore_con_ssl.c
+++ b/TC/ecore/ecore_con/utc_ecore_con_ssl.c
@@ -421,7 +421,7 @@ teardown(void)
  * @li Connection type ECORE_CON_LOAD_CERT | ECORE_CON_REMOTE_TCP
  * @li Server data a string "Server_info"
  * @li Client data a string "Client_info"
- * @li Server ca file server.pem
+ * @li Server ca file ecore_con/server.pem
  * @li Server key file server.key
  * @li Timeout value 10
  *
@@ -554,14 +554,14 @@ START_TEST(utc_ecore_con_ssl_pack)
         ck_abort_msg("[TEST_FAIL]:: %s[%d] : Test has failed..", __FILE__, __LINE__);
      }
 
-  if (!ecore_con_ssl_server_cert_add(server, "server.pem"))
+  if (!ecore_con_ssl_server_cert_add(server, "ecore_con/server.pem"))
      {
         ecore_con_server_del(server);
         free(server_data);
         ck_abort_msg("[TEST_FAIL]:: %s[%d] : Test has failed..", __FILE__, __LINE__);
      }
 
-   if (!ecore_con_ssl_server_privkey_add(server, "server.key"))
+   if (!ecore_con_ssl_server_privkey_add(server, "ecore_con/server.key"))
      {
         ecore_con_server_del(server);
         free(server_data);
@@ -628,7 +628,7 @@ START_TEST(utc_ecore_con_ssl_pack)
         ck_abort_msg("[TEST_FAIL]:: %s[%d] : Test has failed..", __FILE__, __LINE__);
      }
 
-   if (!ecore_con_ssl_server_cafile_add(server, "server.pem"))
+   if (!ecore_con_ssl_server_cafile_add(server, "ecore_con/server.pem"))
      {
         ecore_con_server_del(server);
         free(server_data);
@@ -767,7 +767,7 @@ END_TEST
  * @li Server IP adress 127.0.0.1
  * @li Server port 1111
  * @li Connection type ECORE_CON_LOAD_CERT | ECORE_CON_REMOTE_TCP | ECORE_CON_USE_MIXED
- * @li Server ca file server.pem
+ * @li Server ca file ecore_con/server.pem
  * @li Server key file server.key
  * @li Timeout value 1
  *
@@ -884,13 +884,13 @@ START_TEST(utc_ecore_con_ssl_upgrade)
         ck_abort_msg("[TEST_FAIL]:: %s[%d] : Test has failed..\n", __func__, __LINE__);
      }
 
-   if (!ecore_con_ssl_server_cert_add(server, "server.pem"))
+   if (!ecore_con_ssl_server_cert_add(server, "ecore_con/server.pem"))
      {
         free(server_data);
         ck_abort_msg("[TEST_FAIL]:: %s[%d] : Test has failed..\n", __func__, __LINE__);
      }
 
-   if (!ecore_con_ssl_server_privkey_add(server, "server.key"))
+   if (!ecore_con_ssl_server_privkey_add(server, "ecore_con/server.key"))
      {
         free(server_data);
         ck_abort_msg("[TEST_FAIL]:: %s[%d] : Test has failed..\n", __func__, __LINE__);
@@ -909,7 +909,7 @@ START_TEST(utc_ecore_con_ssl_upgrade)
         ck_abort_msg("[TEST_FAIL]:: %s[%d] : Test has failed..\n", __func__, __LINE__);
      }
 
-   if (!ecore_con_ssl_server_cafile_add(server, "server.pem"))
+   if (!ecore_con_ssl_server_cafile_add(server, "ecore_con/server.pem"))
      {
         free(server_data);
         free(client_data);

diff --git a/TC/ecore/ecore_con/utc_ecore_con_ssl_server_crl_add.c b/TC/ecore/ecore_con/utc_ecore_con_ssl_server_crl_add.c
index c517330414b8381c07069de65ffcf227e46e95d3..eb752fcd9b9f0982f7a86197909d351ba139d016 100644 (file)
--- a/TC/ecore/ecore_con/utc_ecore_con_ssl_server_crl_add.c
+++ b/TC/ecore/ecore_con/utc_ecore_con_ssl_server_crl_add.c
@@ -4,7 +4,7 @@
 #include "../utc_ecore_common.h"
 #include <Ecore_Con.h>
 
-Ecore_Timer *loop_timer_quit = NULL;
+static Ecore_Timer *loop_timer_quit = NULL;
 
 static Eina_Bool
 _timer_cb(void *data EINA_UNUSED)
@@ -33,7 +33,7 @@ _client_error(void *data EINA_UNUSED, int type EINA_UNUSED, void *ev EINA_UNUSED
    ck_abort_msg("[TEST_FAIL]:: %s[%d] : Test has failed..", __FILE__, __LINE__);
    return EINA_FALSE;
 }
-Eina_Bool
+static Eina_Bool
 _add_server(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_Con_Event_Server_Add *ev)
 {
    ecore_con_server_send(ev->server, "hello!", 6);
@@ -42,19 +42,19 @@ _add_server(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_Con_Event_Server
    return ECORE_CALLBACK_RENEW;
 }
 
-Eina_Bool
+static Eina_Bool
 _del_server(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_Con_Event_Server_Del *ev)
 {
    return ECORE_CALLBACK_RENEW;
 }
 
-Eina_Bool
+static Eina_Bool
 _data_server(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_Con_Event_Server_Data *ev)
 {
    return ECORE_CALLBACK_RENEW;
 }
 
-Eina_Bool
+static Eina_Bool
 _add(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_Con_Event_Client_Add *ev)
 {
    ecore_con_client_send(ev->client, "hello!", 6);
@@ -63,13 +63,13 @@ _add(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_Con_Event_Client_Add *e
    return ECORE_CALLBACK_RENEW;
 }
 
-Eina_Bool
+static Eina_Bool
 _del(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_Con_Event_Client_Del *ev)
 {
    return ECORE_CALLBACK_RENEW;
 }
 
-Eina_Bool
+static Eina_Bool
 _data(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_Con_Event_Client_Data *ev)
 {
    return ECORE_CALLBACK_RENEW;
@@ -109,7 +109,7 @@ teardown(void)
  * there is no segmentation fail.
  * @n Input Data:
  * @li svr - the server object.
- * @li "new_cert/ca.crl" - The path to the CRL file.
+ * @li "ecore_con/new_cert/ca.crl" - The path to the CRL file.
  *
  *
  * @procedure
@@ -145,17 +145,17 @@ START_TEST(utc_ecore_con_ssl_server_crl_add_p)
         ck_abort_msg("[TEST_FAIL]:: %s[%d] : Test has failed ..", __FILE__, __LINE__);
      }
 
-   if (!ecore_con_ssl_server_cert_add(svr, "new_cert/capub.pem"))
+   if (!ecore_con_ssl_server_cert_add(svr, "ecore_con/new_cert/capub.pem"))
      {
         ck_abort_msg("[TEST_FAIL]:: %s[%d] : Test has failed..", __FILE__, __LINE__);
      }
 
-   if (!ecore_con_ssl_server_privkey_add(svr, "new_cert/ca.key"))
+   if (!ecore_con_ssl_server_privkey_add(svr, "ecore_con/new_cert/ca.key"))
      {
         ck_abort_msg("[TEST_FAIL]:: %s[%d] : Test has failed..", __FILE__, __LINE__);
      }
 
-   if (!ecore_con_ssl_server_crl_add(svr, "new_cert/ca.crl"))
+   if (!ecore_con_ssl_server_crl_add(svr, "ecore_con/new_cert/ca.crl"))
      {
         ck_abort_msg("[TEST_FAIL]:: %s[%d] : Test has failed ..", __FILE__, __LINE__);
      }
@@ -189,22 +189,22 @@ START_TEST(utc_ecore_con_ssl_server_crl_add_p)
         ck_abort_msg("[TEST_FAIL]:: %s[%d] : Test has failed ..", __FILE__, __LINE__);
      }
 
-   if (!ecore_con_ssl_server_cafile_add(client, "new_cert/capub.pem"))
+   if (!ecore_con_ssl_server_cafile_add(client, "ecore_con/new_cert/capub.pem"))
      {
         ck_abort_msg("[TEST_FAIL]:: %s[%d] : Test has failed ..", __FILE__, __LINE__);
      }
 
-   if (!ecore_con_ssl_server_crl_add(client, "new_cert/ca.crl"))
+   if (!ecore_con_ssl_server_crl_add(client, "ecore_con/new_cert/ca.crl"))
      {
         ck_abort_msg("[TEST_FAIL]:: %s[%d] : Test has failed ..", __FILE__, __LINE__);
      }
 
-   if (!ecore_con_ssl_server_cert_add(client, "new_cert/client01.pem"))
+   if (!ecore_con_ssl_server_cert_add(client, "ecore_con/new_cert/client01.pem"))
      {
         ck_abort_msg("[TEST_FAIL]:: %s[%d] : Test has failed..", __FILE__, __LINE__);
      }
 
-   if (!ecore_con_ssl_server_privkey_add(client, "new_cert/client01.key"))
+   if (!ecore_con_ssl_server_privkey_add(client, "ecore_con/new_cert/client01.key"))
      {
         ck_abort_msg("[TEST_FAIL]:: %s[%d] : Test has failed..", __FILE__, __LINE__);
      }