aboutsummaryrefslogtreecommitdiffstats
path: root/src/tests
diff options
context:
space:
mode:
Diffstat (limited to 'src/tests')
-rw-r--r--src/tests/eet/eet_suite.c14
-rw-r--r--src/tests/eina/eina_test_accessor.c6
-rw-r--r--src/tests/eina/eina_test_counter.c2
-rw-r--r--src/tests/eina/eina_test_error.c2
-rw-r--r--src/tests/eina/eina_test_file.c2
-rw-r--r--src/tests/eina/eina_test_hash.c4
-rw-r--r--src/tests/eina/eina_test_inarray.c4
-rw-r--r--src/tests/eina/eina_test_inlist.c2
-rw-r--r--src/tests/eina/eina_test_iterator.c20
-rw-r--r--src/tests/eina/eina_test_log.c6
-rw-r--r--src/tests/eina/eina_test_magic.c4
-rw-r--r--src/tests/eina/eina_test_matrixsparse.c8
-rw-r--r--src/tests/eina/eina_test_module.c2
-rw-r--r--src/tests/eina/eina_test_rbtree.c6
-rw-r--r--src/tests/eina/eina_test_sched.c2
-rw-r--r--src/tests/eina/eina_test_ustr.c2
-rw-r--r--src/tests/eo/Makefile.am2
17 files changed, 45 insertions, 43 deletions
diff --git a/src/tests/eet/eet_suite.c b/src/tests/eet/eet_suite.c
index 5e14984f8..b00882b9d 100644
--- a/src/tests/eet/eet_suite.c
+++ b/src/tests/eet/eet_suite.c
@@ -679,7 +679,7 @@ _eet_test_ex_check(Eet_Test_Ex_Type *stuff,
} /* _eet_test_ex_check */
static Eina_Bool
-func(__UNUSED__ const Eina_Hash *hash,
+func(EINA_UNUSED const Eina_Hash *hash,
const void *key,
void *data,
void *fdata)
@@ -697,8 +697,8 @@ func(__UNUSED__ const Eina_Hash *hash,
} /* func */
static Eina_Bool
-func7(__UNUSED__ const Eina_Hash *hash,
- __UNUSED__ const void *key,
+func7(EINA_UNUSED const Eina_Hash *hash,
+ EINA_UNUSED const void *key,
void *data,
void *fdata)
{
@@ -1743,8 +1743,8 @@ END_TEST
static int
pass_get(char *pass,
int size,
- __UNUSED__ int rwflags,
- __UNUSED__ void *u)
+ EINA_UNUSED int rwflags,
+ EINA_UNUSED void *u)
{
memset(pass, 0, size);
@@ -1758,8 +1758,8 @@ pass_get(char *pass,
static int
badpass_get(char *pass,
int size,
- __UNUSED__ int rwflags,
- __UNUSED__ void *u)
+ EINA_UNUSED int rwflags,
+ EINA_UNUSED void *u)
{
memset(pass, 0, size);
diff --git a/src/tests/eina/eina_test_accessor.c b/src/tests/eina/eina_test_accessor.c
index 3c85ef037..a99542913 100644
--- a/src/tests/eina/eina_test_accessor.c
+++ b/src/tests/eina/eina_test_accessor.c
@@ -26,7 +26,7 @@
#include "Eina.h"
static Eina_Bool
-eina_accessor_check(__UNUSED__ const Eina_Array *array,
+eina_accessor_check(EINA_UNUSED const Eina_Array *array,
int *data, int *fdata)
{
fail_if(*fdata > *data);
@@ -97,7 +97,7 @@ _eina_test_inlist_build(int i)
}
static Eina_Bool
-eina_accessor_inlist_data_check(__UNUSED__ const Eina_Inlist *in_list,
+eina_accessor_inlist_data_check(EINA_UNUSED const Eina_Inlist *in_list,
Eina_Test_Inlist *data,
int *fdata)
{
@@ -167,7 +167,7 @@ START_TEST(eina_accessor_inlist_simple)
END_TEST
static Eina_Bool
-eina_iterator_list_data_check(__UNUSED__ const Eina_List *list,
+eina_iterator_list_data_check(EINA_UNUSED const Eina_List *list,
int *data,
int *fdata)
{
diff --git a/src/tests/eina/eina_test_counter.c b/src/tests/eina/eina_test_counter.c
index 4d956fd35..1a6c77c95 100644
--- a/src/tests/eina/eina_test_counter.c
+++ b/src/tests/eina/eina_test_counter.c
@@ -38,7 +38,7 @@ struct log_ctx {
//#define SHOW_LOG 1
static void
-_eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args __UNUSED__)
+_eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args EINA_UNUSED)
{
struct log_ctx *ctx = data;
va_list cp_args;
diff --git a/src/tests/eina/eina_test_error.c b/src/tests/eina/eina_test_error.c
index 962f2ded4..2f3d92e2f 100644
--- a/src/tests/eina/eina_test_error.c
+++ b/src/tests/eina/eina_test_error.c
@@ -43,7 +43,7 @@ struct log_ctx {
//#define SHOW_LOG 1
static void
-_eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args __UNUSED__)
+_eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args EINA_UNUSED)
{
struct log_ctx *ctx = data;
va_list cp_args;
diff --git a/src/tests/eina/eina_test_file.c b/src/tests/eina/eina_test_file.c
index a3ba99869..60b3a3c36 100644
--- a/src/tests/eina/eina_test_file.c
+++ b/src/tests/eina/eina_test_file.c
@@ -39,7 +39,7 @@ struct log_ctx {
//#define SHOW_LOG 1
static void
-_eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args __UNUSED__)
+_eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args EINA_UNUSED)
{
struct log_ctx *ctx = data;
va_list cp_args;
diff --git a/src/tests/eina/eina_test_hash.c b/src/tests/eina/eina_test_hash.c
index aeeb655e7..7a1fceaa4 100644
--- a/src/tests/eina/eina_test_hash.c
+++ b/src/tests/eina/eina_test_hash.c
@@ -28,10 +28,10 @@
#include "Eina.h"
static Eina_Bool
-eina_foreach_check(__UNUSED__ const Eina_Hash *hash,
+eina_foreach_check(EINA_UNUSED const Eina_Hash *hash,
const void *key,
void *data,
- __UNUSED__ void *fdata)
+ EINA_UNUSED void *fdata)
{
int *j = data;
int i;
diff --git a/src/tests/eina/eina_test_inarray.c b/src/tests/eina/eina_test_inarray.c
index 5f33f4710..51397707d 100644
--- a/src/tests/eina/eina_test_inarray.c
+++ b/src/tests/eina/eina_test_inarray.c
@@ -289,7 +289,7 @@ START_TEST(eina_inarray_test_reverse)
END_TEST
static Eina_Bool
-array_foreach(const void *array __UNUSED__, void *p, void *user_data __UNUSED__)
+array_foreach(const void *array EINA_UNUSED, void *p, void *user_data EINA_UNUSED)
{
short *member = p;
int *i = user_data;
@@ -299,7 +299,7 @@ array_foreach(const void *array __UNUSED__, void *p, void *user_data __UNUSED__)
}
static Eina_Bool
-array_foreach_stop_2nd(const void *array __UNUSED__, void *p, void *user_data __UNUSED__)
+array_foreach_stop_2nd(const void *array EINA_UNUSED, void *p, void *user_data EINA_UNUSED)
{
short *member = p;
int *i = user_data;
diff --git a/src/tests/eina/eina_test_inlist.c b/src/tests/eina/eina_test_inlist.c
index a8631e708..7d29b37f4 100644
--- a/src/tests/eina/eina_test_inlist.c
+++ b/src/tests/eina/eina_test_inlist.c
@@ -45,7 +45,7 @@ struct log_ctx {
//#define SHOW_LOG 1
static void
-_eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args __UNUSED__)
+_eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args EINA_UNUSED)
{
struct log_ctx *ctx = data;
va_list cp_args;
diff --git a/src/tests/eina/eina_test_iterator.c b/src/tests/eina/eina_test_iterator.c
index 84bb33693..4c14decc7 100644
--- a/src/tests/eina/eina_test_iterator.c
+++ b/src/tests/eina/eina_test_iterator.c
@@ -26,7 +26,7 @@
#include "Eina.h"
static Eina_Bool
-eina_iterator_array_check(__UNUSED__ const Eina_Array *array,
+eina_iterator_array_check(EINA_UNUSED const Eina_Array *array,
int *data, int *fdata)
{
fail_if(*fdata > *data);
@@ -77,7 +77,7 @@ END_TEST
static Eina_Bool
eina_iterator_hash_key_check(const Eina_Hash *hash,
const char *key,
- __UNUSED__ void *fdata)
+ EINA_UNUSED void *fdata)
{
fail_if(eina_hash_find(hash, key) == NULL);
@@ -86,7 +86,7 @@ eina_iterator_hash_key_check(const Eina_Hash *hash,
static Eina_Bool
eina_iterator_hash_data_check(const Eina_Hash *hash,
int *data,
- __UNUSED__ void *fdata)
+ EINA_UNUSED void *fdata)
{
char tmp[10];
@@ -96,9 +96,9 @@ eina_iterator_hash_data_check(const Eina_Hash *hash,
return EINA_TRUE;
}
static Eina_Bool
-eina_iterator_hash_tuple_check(__UNUSED__ const Eina_Hash *hash,
+eina_iterator_hash_tuple_check(EINA_UNUSED const Eina_Hash *hash,
Eina_Hash_Tuple *tuple,
- __UNUSED__ void *fdata)
+ EINA_UNUSED void *fdata)
{
fail_if(atoi((char *)tuple->key) != *((int *)tuple->data));
@@ -160,7 +160,7 @@ _eina_test_inlist_build(int i)
}
static Eina_Bool
-eina_iterator_inlist_data_check(__UNUSED__ const Eina_Inlist *in_list,
+eina_iterator_inlist_data_check(EINA_UNUSED const Eina_Inlist *in_list,
Eina_Test_Inlist *data,
int *fdata)
{
@@ -223,7 +223,7 @@ START_TEST(eina_iterator_inlist_simple)
END_TEST
static Eina_Bool
-eina_iterator_list_data_check(__UNUSED__ const Eina_List *list,
+eina_iterator_list_data_check(EINA_UNUSED const Eina_List *list,
int *data,
int *fdata)
{
@@ -320,7 +320,7 @@ _eina_rbtree_int_new(int value)
}
static Eina_Bool
-eina_iterator_rbtree_data_check_sorted(__UNUSED__ const Eina_List *list,
+eina_iterator_rbtree_data_check_sorted(EINA_UNUSED const Eina_List *list,
Eina_Rbtree_Int *data,
int *fdata)
{
@@ -343,7 +343,7 @@ eina_iterator_rbtree_data_check_sorted(__UNUSED__ const Eina_List *list,
}
static Eina_Bool
-eina_iterator_rbtree_data_check_prefix(__UNUSED__ const Eina_List *list,
+eina_iterator_rbtree_data_check_prefix(EINA_UNUSED const Eina_List *list,
Eina_Rbtree_Int *data,
int *fdata)
{
@@ -366,7 +366,7 @@ eina_iterator_rbtree_data_check_prefix(__UNUSED__ const Eina_List *list,
}
static Eina_Bool
-eina_iterator_rbtree_data_check_postfix(__UNUSED__ const Eina_List *list,
+eina_iterator_rbtree_data_check_postfix(EINA_UNUSED const Eina_List *list,
Eina_Rbtree_Int *data,
int *fdata)
{
diff --git a/src/tests/eina/eina_test_log.c b/src/tests/eina/eina_test_log.c
index e0f0363b9..f922281e6 100644
--- a/src/tests/eina/eina_test_log.c
+++ b/src/tests/eina/eina_test_log.c
@@ -40,7 +40,7 @@ struct log_ctx {
//#define SHOW_LOG 1
static void
-_eina_test_log(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args __UNUSED__)
+_eina_test_log(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args EINA_UNUSED)
{
struct log_ctx *ctx = data;
ck_assert_int_eq(ctx->level, level);
@@ -57,7 +57,7 @@ _eina_test_log(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file,
}
static void
-_eina_test_log_domain(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args __UNUSED__)
+_eina_test_log_domain(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args EINA_UNUSED)
{
struct log_ctx *ctx = data;
ck_assert_int_eq(ctx->level, level);
@@ -73,7 +73,7 @@ _eina_test_log_domain(const Eina_Log_Domain *d, Eina_Log_Level level, const char
}
static void
-_eina_test_log_safety(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args __UNUSED__)
+_eina_test_log_safety(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args EINA_UNUSED)
{
struct log_ctx *ctx = data;
va_list cp_args;
diff --git a/src/tests/eina/eina_test_magic.c b/src/tests/eina/eina_test_magic.c
index d0a374e77..b41ed5d09 100644
--- a/src/tests/eina/eina_test_magic.c
+++ b/src/tests/eina/eina_test_magic.c
@@ -50,7 +50,7 @@ struct log_ctx {
//#define SHOW_LOG 1
static void
-_eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args __UNUSED__)
+_eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args EINA_UNUSED)
{
struct log_ctx *ctx = data;
va_list cp_args;
@@ -76,7 +76,7 @@ _eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const
}
static void
-_eina_test_magic_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args __UNUSED__)
+_eina_test_magic_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args EINA_UNUSED)
{
struct log_ctx *ctx = data;
diff --git a/src/tests/eina/eina_test_matrixsparse.c b/src/tests/eina/eina_test_matrixsparse.c
index e07b1eead..1aaf4e62a 100644
--- a/src/tests/eina/eina_test_matrixsparse.c
+++ b/src/tests/eina/eina_test_matrixsparse.c
@@ -10,8 +10,8 @@
#define MAX_ROWS 10
#define MAX_COLS 10
-static void eina_matrixsparse_free_cell_cb(void *user_data __UNUSED__,
- void *cell_data __UNUSED__)
+static void eina_matrixsparse_free_cell_cb(void *user_data EINA_UNUSED,
+ void *cell_data EINA_UNUSED)
{
}
@@ -35,8 +35,8 @@ static void matrixsparse_initialize(Eina_Matrixsparse *matrix,
static void matrixsparse_check(Eina_Matrixsparse *matrix,
long data[MAX_ROWS][MAX_COLS],
- unsigned long nrows __UNUSED__,
- unsigned long ncols __UNUSED__)
+ unsigned long nrows EINA_UNUSED,
+ unsigned long ncols EINA_UNUSED)
{
unsigned long i, j;
long *test1;
diff --git a/src/tests/eina/eina_test_module.c b/src/tests/eina/eina_test_module.c
index 56bdca7bc..de7fa697e 100644
--- a/src/tests/eina/eina_test_module.c
+++ b/src/tests/eina/eina_test_module.c
@@ -25,7 +25,7 @@
#include "eina_suite.h"
#include "Eina.h"
-static Eina_Bool list_cb(Eina_Module *m, void *data __UNUSED__)
+static Eina_Bool list_cb(Eina_Module *m, void *data EINA_UNUSED)
{
int *sym;
const char *file;
diff --git a/src/tests/eina/eina_test_rbtree.c b/src/tests/eina/eina_test_rbtree.c
index fabe2bfd2..dba904a21 100644
--- a/src/tests/eina/eina_test_rbtree.c
+++ b/src/tests/eina/eina_test_rbtree.c
@@ -87,7 +87,7 @@ struct _Eina_Rbtree_Int
static Eina_Rbtree_Direction
eina_rbtree_int_cmp(const Eina_Rbtree_Int *left,
const Eina_Rbtree_Int *right,
- __UNUSED__ void *data)
+ EINA_UNUSED void *data)
{
fail_if(!left);
fail_if(!right);
@@ -101,8 +101,8 @@ eina_rbtree_int_cmp(const Eina_Rbtree_Int *left,
static int
eina_rbtree_int_key(const Eina_Rbtree_Int *node,
const int *key,
- __UNUSED__ int length,
- __UNUSED__ void *data)
+ EINA_UNUSED int length,
+ EINA_UNUSED void *data)
{
fail_if(!node);
return node->value - *key;
diff --git a/src/tests/eina/eina_test_sched.c b/src/tests/eina/eina_test_sched.c
index ff83a7efc..53a771dc7 100644
--- a/src/tests/eina/eina_test_sched.c
+++ b/src/tests/eina/eina_test_sched.c
@@ -37,7 +37,7 @@
*/
static void *
-_thread_run(void *arg __UNUSED__)
+_thread_run(void *arg EINA_UNUSED)
{
int niceval = getpriority(PRIO_PROCESS, 0);
int niceval2;
diff --git a/src/tests/eina/eina_test_ustr.c b/src/tests/eina/eina_test_ustr.c
index 75126cc6f..6240dd671 100644
--- a/src/tests/eina/eina_test_ustr.c
+++ b/src/tests/eina/eina_test_ustr.c
@@ -39,7 +39,7 @@ struct log_ctx {
//#define SHOW_LOG 1
static void
-_eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args __UNUSED__)
+_eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args EINA_UNUSED)
{
struct log_ctx *ctx = data;
va_list cp_args;
diff --git a/src/tests/eo/Makefile.am b/src/tests/eo/Makefile.am
index 15241bb08..b6fab2ef7 100644
--- a/src/tests/eo/Makefile.am
+++ b/src/tests/eo/Makefile.am
@@ -1,7 +1,9 @@
MAINTAINERCLEANFILES = Makefile.in
AM_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
-I$(top_srcdir)/src/lib/eo \
+-I$(top_builddir)/src/lib/eina \
-I$(top_builddir)/src/lib/eo \
@EFL_EO_BUILD@ \
@EO_CFLAGS@ \