apps/testcase: refactor codes

1. remove unused definition, RETURN_ERR
2. remove unused header file, tc_internal.h on systemio itc
3. fix incorrect definition of preventing duplicated-including header file
4. move a location of including header to inside definition
5. remove unnecessary relative path of header, tc_common.h
6. remove definition of same global variables and initialize them before using,
  total_pass and total_fail

diff --git a/apps/examples/testcase/le_tc/kernel/tc_internal.h b/apps/examples/testcase/le_tc/kernel/tc_internal.h
index f11ad85..25c041c 100644 (file)
--- a/apps/examples/testcase/le_tc/kernel/tc_internal.h
+++ b/apps/examples/testcase/le_tc/kernel/tc_internal.h
@@ -22,8 +22,6 @@
 #ifndef __EXAMPLES_TESTCASE_KERNEL_TC_INTERNAL_H
 #define __EXAMPLES_TESTCASE_KERNEL_TC_INTERNAL_H
 
-#define RETURN_ERR return
-
 #ifdef CONFIG_CPP_HAVE_VARARGS
 
 #ifdef CONFIG_DEBUG_TC_KN

diff --git a/apps/examples/testcase/le_tc/kernel/tc_signal.c b/apps/examples/testcase/le_tc/kernel/tc_signal.c
index b33a367..9d66bbe 100644 (file)
--- a/apps/examples/testcase/le_tc/kernel/tc_signal.c
+++ b/apps/examples/testcase/le_tc/kernel/tc_signal.c
@@ -367,7 +367,7 @@ errout_with_mask:
        sigprocmask(SIG_SETMASK, &saved, NULL);
 errout:
 
-       RETURN_ERR;
+       return;
 }
 
 /**

diff --git a/apps/examples/testcase/le_tc/network/tc_internal.h b/apps/examples/testcase/le_tc/network/tc_internal.h
index 276cf7b..39338d7 100644 (file)
--- a/apps/examples/testcase/le_tc/network/tc_internal.h
+++ b/apps/examples/testcase/le_tc/network/tc_internal.h
@@ -22,8 +22,6 @@
 #ifndef __EXAMPLES_TESTCASE_NETWORK_TC_INTERNAL_H
 #define __EXAMPLES_TESTCASE_NETWORK_TC_INTERNAL_H
 
-#define RETURN_ERR return
-
 #include "tc_common.h"
 
 extern int total_pass;

diff --git a/apps/examples/testcase/ta_tc/arastorage/itc/itc_arastorage_main.c b/apps/examples/testcase/ta_tc/arastorage/itc/itc_arastorage_main.c
index 0660b11..2bed6a4 100644 (file)
--- a/apps/examples/testcase/ta_tc/arastorage/itc/itc_arastorage_main.c
+++ b/apps/examples/testcase/ta_tc/arastorage/itc/itc_arastorage_main.c
@@ -24,7 +24,7 @@
 #include <arastorage/arastorage.h>
 #include <apps/shell/tash.h>
 #include <tinyara/fs/fs_utils.h>
-#include "../../../tc_common.h"
+#include "tc_common.h"
 
 /****************************************************************************
  * Definitions

diff --git a/apps/examples/testcase/ta_tc/device_management/itc/itc_internal.h b/apps/examples/testcase/ta_tc/device_management/itc/itc_internal.h
index 24a4787..4c953b7 100644 (file)
--- a/apps/examples/testcase/ta_tc/device_management/itc/itc_internal.h
+++ b/apps/examples/testcase/ta_tc/device_management/itc/itc_internal.h
@@ -19,15 +19,13 @@
 /// @file tc_internal.h
 
 /// @brief Header file for Kernel TestCase Example
-#include "../../../tc_common.h"
-#ifndef __EXAMPLES_TESTCASE_DM_TC_INTERNAL_H
-#define __EXAMPLES_TESTCASE_DM_TC_INTERNAL_H
+#ifndef __EXAMPLES_TESTCASE_DM_ITC_INTERNAL_H
+#define __EXAMPLES_TESTCASE_DM_ITC_INTERNAL_H
 
-#define RETURN_ERR return
+#include "tc_common.h"
 
 #define DM_ITC_PRINT printf
 
-
 /**********************************************************
 * ITC Function Declarations
 **********************************************************/
@@ -83,5 +81,5 @@ int  itc_dm_conn_regi_unreg_linkdown_main(void);
 #endif
 #endif
 
-#endif /* __EXAMPLES_TESTCASE_KERNEL_TC_INTERNAL_H */
+#endif /* __EXAMPLES_TESTCASE_DM_ITC_INTERNAL_H */
 

diff --git a/apps/examples/testcase/ta_tc/device_management/utc/utc_dm_lwm2m.c b/apps/examples/testcase/ta_tc/device_management/utc/utc_dm_lwm2m.c
index 9df8176..fa32fe7 100644 (file)
--- a/apps/examples/testcase/ta_tc/device_management/utc/utc_dm_lwm2m.c
+++ b/apps/examples/testcase/ta_tc/device_management/utc/utc_dm_lwm2m.c
@@ -29,7 +29,7 @@
 #include "utc_internal.h"
 #include "dm_lwm2m.h"
 #include "dm_error.h"
-#include "../../../tc_common.h"
+#include "tc_common.h"
 
 #define UTC_DM_IPADDR_LEN 20
 #define UTC_DM_SERVER_PORT 6

diff --git a/apps/examples/testcase/ta_tc/device_management/utc/utc_dm_main.c b/apps/examples/testcase/ta_tc/device_management/utc/utc_dm_main.c
index 36de28b..2b93899 100644 (file)
--- a/apps/examples/testcase/ta_tc/device_management/utc/utc_dm_main.c
+++ b/apps/examples/testcase/ta_tc/device_management/utc/utc_dm_main.c
@@ -32,9 +32,6 @@
 
 #define NET_DEVNAME "wl1"
 
-int total_pass = 0;
-int total_fail = 0;
-
 extern sem_t tc_sem;
 extern int working_tc;
 
@@ -158,6 +155,10 @@ int utc_dm_main(int argc, char *argv[])
 {
        sem_wait(&tc_sem);
        working_tc++;
+
+       total_pass = 0;
+       total_fail = 0;
+
 #ifndef CONFIG_DM_WIFI
        printf("=== Please Setup WiFi Info ===\n");
        return 0;

diff --git a/apps/examples/testcase/ta_tc/device_management/utc/utc_internal.h b/apps/examples/testcase/ta_tc/device_management/utc/utc_internal.h
index e4a700c..6efffa9 100644 (file)
--- a/apps/examples/testcase/ta_tc/device_management/utc/utc_internal.h
+++ b/apps/examples/testcase/ta_tc/device_management/utc/utc_internal.h
@@ -19,12 +19,10 @@
 /// @file tc_internal.h
 
 /// @brief Header file for Kernel TestCase Example
-#ifndef __EXAMPLES_TESTCASE_DM_TC_INTERNAL_H
-#define __EXAMPLES_TESTCASE_DM_TC_INTERNAL_H
+#ifndef __EXAMPLES_TESTCASE_DM_UTC_INTERNAL_H
+#define __EXAMPLES_TESTCASE_DM_UTC_INTERNAL_H
 
-#include "../../../tc_common.h"
-
-#define RETURN_ERR return
+#include "tc_common.h"
 
 #define DM_TC_PRINT printf
 
@@ -89,5 +87,5 @@ int   dm_conn_unregi_linkup_main(void);
 int    dm_conn_unregi_linkdown_main(void);
 #endif
 
-#endif /* __EXAMPLES_TESTCASE_KERNEL_TC_INTERNAL_H */
+#endif /* __EXAMPLES_TESTCASE_DM_UTC_INTERNAL_H */
 

diff --git a/apps/examples/testcase/ta_tc/systemio/itc/itc_internal.h b/apps/examples/testcase/ta_tc/systemio/itc/itc_internal.h
index 6f6eaea..cd5fb78 100644 (file)
--- a/apps/examples/testcase/ta_tc/systemio/itc/itc_internal.h
+++ b/apps/examples/testcase/ta_tc/systemio/itc/itc_internal.h
@@ -19,11 +19,10 @@
 /// @file itc_internal.h
 
 /// @brief Header file for System IO TestCase Example
-#include "../../../tc_common.h"
-#ifndef __EXAMPLES_TESTCASE_SYSTEMIO_TC_INTERNAL_H
-#define __EXAMPLES_TESTCASE_SYSTEMIO_TC_INTERNAL_H
+#ifndef __EXAMPLES_TESTCASE_SYSTEMIO_ITC_INTERNAL_H
+#define __EXAMPLES_TESTCASE_SYSTEMIO_ITC_INTERNAL_H
 
-#define RETURN_ERR return
+#include "tc_common.h"
 //#define IS_PASS(value) value==1?"PASS":"FAIL"
 
 #define SYSIO_ITC_PRINT   printf
@@ -38,4 +37,4 @@
 **********************************************************/
 char *Expect_Value(int, int);
 
-#endif /* __EXAMPLES_TESTCASE_SYSTEMIO_TC_INTERNAL_H */
+#endif /* __EXAMPLES_TESTCASE_SYSTEMIO_ITC_INTERNAL_H */

diff --git a/apps/examples/testcase/ta_tc/systemio/itc/tc_internal.h b/apps/examples/testcase/ta_tc/systemio/itc/tc_internal.h
deleted file mode 100644 (file)
index 84a2404..0000000
--- a/apps/examples/testcase/ta_tc/systemio/itc/tc_internal.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/****************************************************************************
- *
- * Copyright 2016 Samsung Electronics All Rights Reserved.
- *
- * 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.
- *
- ****************************************************************************/
-
-/// @file tc_internal.h
-
-/// @brief Header file for System IO TestCase Example
-#ifndef __EXAMPLES_TESTCASE_SYSTEMIO_TC_INTERNAL_H
-#define __EXAMPLES_TESTCASE_SYSTEMIO_TC_INTERNAL_H
-
-#define RETURN_ERR return
-//#define IS_PASS(value) value==1?"PASS":"FAIL"
-
-extern int total_pass;
-extern int total_fail;
-
-#define SYSIO_ITC_PRINT   printf
-#define SYSIO_TC_UART_PRINT   printf
-#define SYSIO_TC_GPIO_PRINT   printf
-#define SYSIO_TC_PWM_PRINT   printf
-#define SYSIO_TC_I2C_PRINT   printf
-
-
-/**********************************************************
-* TC Function Declarations
-**********************************************************/
-char *Expect_Value(int, int);
-
-#endif /* __EXAMPLES_TESTCASE_SYSTEMIO_TC_INTERNAL_H */

diff --git a/apps/examples/testcase/ta_tc/systemio/utc/utc_internal.h b/apps/examples/testcase/ta_tc/systemio/utc/utc_internal.h
index 92731d4..b912332 100644 (file)
--- a/apps/examples/testcase/ta_tc/systemio/utc/utc_internal.h
+++ b/apps/examples/testcase/ta_tc/systemio/utc/utc_internal.h
@@ -19,10 +19,9 @@
 /// @file tc_internal.h
 
 /// @brief Header file for System IO TestCase Example
-#ifndef __EXAMPLES_TESTCASE_SYSTEMIO_TC_INTERNAL_H
-#define __EXAMPLES_TESTCASE_SYSTEMIO_TC_INTERNAL_H
+#ifndef __EXAMPLES_TESTCASE_SYSTEMIO_UTC_INTERNAL_H
+#define __EXAMPLES_TESTCASE_SYSTEMIO_UTC_INTERNAL_H
 
-#define RETURN_ERR return
 //#define IS_PASS(value) value==1?"PASS":"FAIL"
 
 #include "tc_common.h"
@@ -41,4 +40,4 @@ extern int total_fail;
 **********************************************************/
 char *Expect_Value(int, int);
 
-#endif                                                 /* __EXAMPLES_TESTCASE_SYSTEMIO_TC_INTERNAL_H */
+#endif                                                 /* __EXAMPLES_TESTCASE_SYSTEMIO_UTC_INTERNAL_H */

diff --git a/apps/examples/testcase/ta_tc/systemio/utc/utc_sysio_main.c b/apps/examples/testcase/ta_tc/systemio/utc/utc_sysio_main.c
index d9efd97..08a287e 100644 (file)
--- a/apps/examples/testcase/ta_tc/systemio/utc/utc_sysio_main.c
+++ b/apps/examples/testcase/ta_tc/systemio/utc/utc_sysio_main.c
@@ -73,8 +73,6 @@ static void show_usage(FAR const char *progname)
 
 int sysio_utc(int argc, FAR char *argv[])
 {
-       total_pass = 0;
-       total_fail = 0;
        int cmdtype = 0;
 
        sem_wait(&tc_sem);