summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2019-06-20 12:50:35 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2019-06-20 12:50:35 +0100
commitba22016c4cc130a93450f1ccc2c267f28e5ba7d0 (patch)
tree66d5bad3317c0e8632be92cb610f3c09162d4521
parent33f5e53af3cf059b234f4e618f573ac6b354f7c6 (diff)
tests: fix warnings and undef ref on Windows (using meson :-) )
Summary: we need to include evil_private.h so that some symbols are declared Test Plan: compilation Reviewers: raster, zmike, cedric Subscribers: #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D9129
-rw-r--r--src/tests/ecore/ecore_test_ecore.c4
-rw-r--r--src/tests/ecore/ecore_test_ecore_file.c4
-rw-r--r--src/tests/ecore/ecore_test_ecore_thread_eina_thread_queue.c4
-rw-r--r--src/tests/ecore/efl_app_test_loop_fd.c5
-rw-r--r--src/tests/ecore_con/ecore_con_test_ecore_con.c4
-rw-r--r--src/tests/edje/edje_test_features.c4
-rw-r--r--src/tests/efreet/ef_data_dirs.c4
-rw-r--r--src/tests/efreet/ef_icon_theme.c4
-rw-r--r--src/tests/eina/eina_test_file.c7
-rw-r--r--src/tests/eio/eio_test_common.c4
-rw-r--r--src/tests/eio/eio_test_manager.c3
-rw-r--r--src/tests/eio/eio_test_monitor.c4
-rw-r--r--src/tests/eio/eio_test_sentry.c4
-rw-r--r--src/tests/elua/elua_lib.c4
-rw-r--r--src/tests/elua/elua_suite.c4
-rw-r--r--src/tests/eo/suite/eo_test_class_errors.c3
-rw-r--r--src/tests/eolian/eolian_parsing.c4
-rw-r--r--src/tests/evas/evas_test_evasgl.c4
-rw-r--r--src/tests/evas/evas_test_filters.c4
19 files changed, 70 insertions, 8 deletions
diff --git a/src/tests/ecore/ecore_test_ecore.c b/src/tests/ecore/ecore_test_ecore.c
index 8159e22..8fe433f 100644
--- a/src/tests/ecore/ecore_test_ecore.c
+++ b/src/tests/ecore/ecore_test_ecore.c
@@ -5,6 +5,10 @@
5#include <stdio.h> 5#include <stdio.h>
6#include <unistd.h> 6#include <unistd.h>
7 7
8#ifdef _WIN32
9# include <evil_private.h> /* pipe */
10#endif
11
8#include <Eina.h> 12#include <Eina.h>
9#include <Ecore.h> 13#include <Ecore.h>
10 14
diff --git a/src/tests/ecore/ecore_test_ecore_file.c b/src/tests/ecore/ecore_test_ecore_file.c
index 8fff2eb..fe0e73f 100644
--- a/src/tests/ecore/ecore_test_ecore_file.c
+++ b/src/tests/ecore/ecore_test_ecore_file.c
@@ -9,6 +9,10 @@
9#include <fcntl.h> 9#include <fcntl.h>
10#include <libgen.h> 10#include <libgen.h>
11 11
12#ifdef _WIN32
13# include <evil_private.h> /* setenv */
14#endif
15
12#include <Eina.h> 16#include <Eina.h>
13#include <Ecore.h> 17#include <Ecore.h>
14#include <Ecore_File.h> 18#include <Ecore_File.h>
diff --git a/src/tests/ecore/ecore_test_ecore_thread_eina_thread_queue.c b/src/tests/ecore/ecore_test_ecore_thread_eina_thread_queue.c
index cb3985b..be5c3cd 100644
--- a/src/tests/ecore/ecore_test_ecore_thread_eina_thread_queue.c
+++ b/src/tests/ecore/ecore_test_ecore_thread_eina_thread_queue.c
@@ -5,6 +5,10 @@
5#include <stdio.h> 5#include <stdio.h>
6#include <unistd.h> 6#include <unistd.h>
7 7
8#ifdef _WIN32
9# include <evil_private.h> /* pipe */
10#endif
11
8#include <Eina.h> 12#include <Eina.h>
9#include <Ecore.h> 13#include <Ecore.h>
10 14
diff --git a/src/tests/ecore/efl_app_test_loop_fd.c b/src/tests/ecore/efl_app_test_loop_fd.c
index e5ad901..26bd318 100644
--- a/src/tests/ecore/efl_app_test_loop_fd.c
+++ b/src/tests/ecore/efl_app_test_loop_fd.c
@@ -4,6 +4,11 @@
4 4
5#include <stdio.h> 5#include <stdio.h>
6#include <unistd.h> 6#include <unistd.h>
7
8#ifdef _WIN32
9# include <evil_private.h> /* pipe */
10#endif
11
7#define EFL_NOLEGACY_API_SUPPORT 12#define EFL_NOLEGACY_API_SUPPORT
8#include <Efl_Core.h> 13#include <Efl_Core.h>
9#include "efl_app_suite.h" 14#include "efl_app_suite.h"
diff --git a/src/tests/ecore_con/ecore_con_test_ecore_con.c b/src/tests/ecore_con/ecore_con_test_ecore_con.c
index e128a9d..45d5671 100644
--- a/src/tests/ecore_con/ecore_con_test_ecore_con.c
+++ b/src/tests/ecore_con/ecore_con_test_ecore_con.c
@@ -4,6 +4,10 @@
4 4
5#include <stdio.h> 5#include <stdio.h>
6 6
7#ifdef _WIN32
8# include <evil_private.h> /* setenv unsetenv */
9#endif
10
7#include <Ecore.h> 11#include <Ecore.h>
8#include <Ecore_Con.h> 12#include <Ecore_Con.h>
9 13
diff --git a/src/tests/edje/edje_test_features.c b/src/tests/edje/edje_test_features.c
index 449e97e..4b6ddb8 100644
--- a/src/tests/edje/edje_test_features.c
+++ b/src/tests/edje/edje_test_features.c
@@ -5,6 +5,10 @@
5#include <unistd.h> 5#include <unistd.h>
6#include <stdio.h> 6#include <stdio.h>
7 7
8#ifdef _WIN32
9# include <evil_private.h> /* setenv realpath */
10#endif
11
8#define EFL_GFX_FILTER_BETA 12#define EFL_GFX_FILTER_BETA
9#define EFL_CANVAS_LAYOUT_BETA 13#define EFL_CANVAS_LAYOUT_BETA
10 14
diff --git a/src/tests/efreet/ef_data_dirs.c b/src/tests/efreet/ef_data_dirs.c
index d79b742..4a0fa03 100644
--- a/src/tests/efreet/ef_data_dirs.c
+++ b/src/tests/efreet/ef_data_dirs.c
@@ -6,6 +6,10 @@
6#include <stdio.h> 6#include <stdio.h>
7#include <string.h> 7#include <string.h>
8 8
9#ifdef _WIN32
10# include <evil_private.h> /* setenv unsetenv */
11#endif
12
9#include <Ecore_File.h> 13#include <Ecore_File.h>
10#include <Efreet.h> 14#include <Efreet.h>
11 15
diff --git a/src/tests/efreet/ef_icon_theme.c b/src/tests/efreet/ef_icon_theme.c
index 7b4cb5b..25e0e66 100644
--- a/src/tests/efreet/ef_icon_theme.c
+++ b/src/tests/efreet/ef_icon_theme.c
@@ -7,6 +7,10 @@
7#include <string.h> 7#include <string.h>
8#include <limits.h> 8#include <limits.h>
9 9
10#ifdef _WIN32
11# include <evil_private.h> /* unsetenv */
12#endif
13
10#include <Ecore.h> 14#include <Ecore.h>
11#include <Ecore_File.h> 15#include <Ecore_File.h>
12#include <Efreet.h> 16#include <Efreet.h>
diff --git a/src/tests/eina/eina_test_file.c b/src/tests/eina/eina_test_file.c
index 3d75f5e..365b2f8 100644
--- a/src/tests/eina/eina_test_file.c
+++ b/src/tests/eina/eina_test_file.c
@@ -28,7 +28,7 @@
28#include <fcntl.h> 28#include <fcntl.h>
29 29
30#ifdef _WIN32 30#ifdef _WIN32
31# include <windows.h> 31# include <evil_private.h> /* mkdir */
32#endif 32#endif
33 33
34#include <Eina.h> 34#include <Eina.h>
@@ -724,7 +724,10 @@ EFL_END_TEST
724EFL_START_TEST(eina_test_file_mktemp) 724EFL_START_TEST(eina_test_file_mktemp)
725{ 725{
726 Eina_Tmpstr *tmpfile, *tmpdir = NULL; 726 Eina_Tmpstr *tmpfile, *tmpdir = NULL;
727 char buf[PATH_MAX], fmt[256]; 727 char buf[PATH_MAX];
728#ifndef _WIN32
729 char fmt[256];
730#endif
728 Eina_File_Direct_Info *info; 731 Eina_File_Direct_Info *info;
729 Eina_Iterator *it; 732 Eina_Iterator *it;
730 Eina_File *file; 733 Eina_File *file;
diff --git a/src/tests/eio/eio_test_common.c b/src/tests/eio/eio_test_common.c
index 711c5bf..5872cea 100644
--- a/src/tests/eio/eio_test_common.c
+++ b/src/tests/eio/eio_test_common.c
@@ -8,6 +8,10 @@
8#include <sys/stat.h> 8#include <sys/stat.h>
9#include <fcntl.h> 9#include <fcntl.h>
10 10
11#ifdef _WIN32
12# include <evil_private.h> /* mkdir */
13#endif
14
11#include "eio_suite.h" 15#include "eio_suite.h"
12#include "eio_test_common.h" 16#include "eio_test_common.h"
13 17
diff --git a/src/tests/eio/eio_test_manager.c b/src/tests/eio/eio_test_manager.c
index 79a6c2e..fb6c7f4 100644
--- a/src/tests/eio/eio_test_manager.c
+++ b/src/tests/eio/eio_test_manager.c
@@ -148,7 +148,10 @@ _stat_done_cb(void *data,
148 148
149 fail_if(!eina_value_struct_get(&st, "mode", &mode)); 149 fail_if(!eina_value_struct_get(&st, "mode", &mode));
150 fail_if(S_ISDIR(mode) != *is_dir); 150 fail_if(S_ISDIR(mode) != *is_dir);
151 /* no symbolic link on Windows */
152#ifndef _WIN32
151 fail_if(S_ISLNK(mode)); 153 fail_if(S_ISLNK(mode));
154#endif
152 155
153 rights = mode & (S_IRWXU | S_IRWXG | S_IRWXO); 156 rights = mode & (S_IRWXU | S_IRWXG | S_IRWXO);
154 fail_if(rights != default_rights); 157 fail_if(rights != default_rights);
diff --git a/src/tests/eio/eio_test_monitor.c b/src/tests/eio/eio_test_monitor.c
index a209287..bbe860b 100644
--- a/src/tests/eio/eio_test_monitor.c
+++ b/src/tests/eio/eio_test_monitor.c
@@ -769,7 +769,7 @@ void eio_test_monitor(TCase *tc)
769 tcase_add_test(tc, eio_test_monitor_directory_multi_file_created_notify); 769 tcase_add_test(tc, eio_test_monitor_directory_multi_file_created_notify);
770 tcase_add_test(tc, eio_test_monitor_directory_file_deleted_notify); 770 tcase_add_test(tc, eio_test_monitor_directory_file_deleted_notify);
771 tcase_add_test(tc, eio_test_monitor_directory_file_modified_notify); 771 tcase_add_test(tc, eio_test_monitor_directory_file_modified_notify);
772#if !defined(_WIN32) && !defined(__MACH__) 772#if !defined(__MACH__)
773 tcase_add_test(tc, eio_test_monitor_directory_file_closed_notify); 773 tcase_add_test(tc, eio_test_monitor_directory_file_closed_notify);
774#endif 774#endif
775 tcase_add_test(tc, eio_test_monitor_directory_directory_created_notify); 775 tcase_add_test(tc, eio_test_monitor_directory_directory_created_notify);
@@ -781,7 +781,7 @@ void eio_test_monitor(TCase *tc)
781 781
782 tcase_add_test(tc, eio_test_monitor_file_file_modified_notify); 782 tcase_add_test(tc, eio_test_monitor_file_file_modified_notify);
783 tcase_add_test(tc, eio_test_monitor_file_file_attrib_modified_notify); 783 tcase_add_test(tc, eio_test_monitor_file_file_attrib_modified_notify);
784#if !defined(_WIN32) && !defined(__MACH__) 784#if !defined(__MACH__)
785 tcase_add_test(tc, eio_test_monitor_file_file_closed_notify); 785 tcase_add_test(tc, eio_test_monitor_file_file_closed_notify);
786#endif 786#endif
787#ifndef __MACH__ 787#ifndef __MACH__
diff --git a/src/tests/eio/eio_test_sentry.c b/src/tests/eio/eio_test_sentry.c
index 5bdf341..5e21075 100644
--- a/src/tests/eio/eio_test_sentry.c
+++ b/src/tests/eio/eio_test_sentry.c
@@ -674,7 +674,7 @@ void eio_test_sentry(TCase *tc)
674 tcase_add_test(tc, eio_test_sentry_directory_file_created_notify); 674 tcase_add_test(tc, eio_test_sentry_directory_file_created_notify);
675 tcase_add_test(tc, eio_test_sentry_directory_file_deleted_notify); 675 tcase_add_test(tc, eio_test_sentry_directory_file_deleted_notify);
676 tcase_add_test(tc, eio_test_sentry_directory_file_modified_notify); 676 tcase_add_test(tc, eio_test_sentry_directory_file_modified_notify);
677#if !defined(_WIN32) && !defined(__MACH__) 677#if !defined(__MACH__)
678 tcase_add_test(tc, eio_test_sentry_directory_file_closed_notify); 678 tcase_add_test(tc, eio_test_sentry_directory_file_closed_notify);
679#endif 679#endif
680 tcase_add_test(tc, eio_test_sentry_directory_directory_created_notify); 680 tcase_add_test(tc, eio_test_sentry_directory_directory_created_notify);
@@ -686,7 +686,7 @@ void eio_test_sentry(TCase *tc)
686 686
687 tcase_add_test(tc, eio_test_sentry_file_file_modified_notify); 687 tcase_add_test(tc, eio_test_sentry_file_file_modified_notify);
688 tcase_add_test(tc, eio_test_sentry_file_file_attrib_modified_notify); 688 tcase_add_test(tc, eio_test_sentry_file_file_attrib_modified_notify);
689#if !defined(_WIN32) && !defined(__MACH__) 689#if !defined(__MACH__)
690 tcase_add_test(tc, eio_test_sentry_file_file_closed_notify); 690 tcase_add_test(tc, eio_test_sentry_file_file_closed_notify);
691#endif 691#endif
692#ifndef __MACH__ 692#ifndef __MACH__
diff --git a/src/tests/elua/elua_lib.c b/src/tests/elua/elua_lib.c
index c39d056..f3d11d5 100644
--- a/src/tests/elua/elua_lib.c
+++ b/src/tests/elua/elua_lib.c
@@ -6,6 +6,10 @@
6#include <stdio.h> 6#include <stdio.h>
7#include <unistd.h> 7#include <unistd.h>
8 8
9#ifdef _WIN32
10# include <evil_private.h> /* setenv unsetenv */
11#endif
12
9#include <Eina.h> 13#include <Eina.h>
10#include <Elua.h> 14#include <Elua.h>
11 15
diff --git a/src/tests/elua/elua_suite.c b/src/tests/elua/elua_suite.c
index 0ed47f8..b1dcc23 100644
--- a/src/tests/elua/elua_suite.c
+++ b/src/tests/elua/elua_suite.c
@@ -2,6 +2,10 @@
2# include <config.h> 2# include <config.h>
3#endif 3#endif
4 4
5#ifdef _WIN32
6# include <evil_private.h> /* setenv unsetenv */
7#endif
8
5#include "elua_suite.h" 9#include "elua_suite.h"
6#include "../efl_check.h" 10#include "../efl_check.h"
7#include <Elua.h> 11#include <Elua.h>
diff --git a/src/tests/eo/suite/eo_test_class_errors.c b/src/tests/eo/suite/eo_test_class_errors.c
index a505219..2ef4209 100644
--- a/src/tests/eo/suite/eo_test_class_errors.c
+++ b/src/tests/eo/suite/eo_test_class_errors.c
@@ -196,6 +196,8 @@ EFL_END_TEST
196static void _null_fct(Eo *eo_obj EINA_UNUSED, void *d EINA_UNUSED) { } 196static void _null_fct(Eo *eo_obj EINA_UNUSED, void *d EINA_UNUSED) { }
197void null_fct (void) {} 197void null_fct (void) {}
198 198
199/* This test is not relevant for WIN32. */
200#ifndef _WIN32
199static Eina_Bool 201static Eina_Bool
200_null_class_initializer(Efl_Class *klass) 202_null_class_initializer(Efl_Class *klass)
201{ 203{
@@ -231,6 +233,7 @@ EFL_START_TEST(eo_null_api)
231 233
232} 234}
233EFL_END_TEST 235EFL_END_TEST
236#endif
234 237
235static Eina_Bool 238static Eina_Bool
236_redefined_class_initializer(Efl_Class *klass) 239_redefined_class_initializer(Efl_Class *klass)
diff --git a/src/tests/eolian/eolian_parsing.c b/src/tests/eolian/eolian_parsing.c
index c8f4383..57120f6 100644
--- a/src/tests/eolian/eolian_parsing.c
+++ b/src/tests/eolian/eolian_parsing.c
@@ -5,6 +5,10 @@
5#include <stdlib.h> 5#include <stdlib.h>
6#include <stdio.h> 6#include <stdio.h>
7 7
8#ifdef _WIN32
9# include <evil_private.h> /* setenv unsetenv */
10#endif
11
8#include <Eina.h> 12#include <Eina.h>
9#include <Eolian.h> 13#include <Eolian.h>
10 14
diff --git a/src/tests/evas/evas_test_evasgl.c b/src/tests/evas/evas_test_evasgl.c
index 603ed87..07b8864 100644
--- a/src/tests/evas/evas_test_evasgl.c
+++ b/src/tests/evas/evas_test_evasgl.c
@@ -12,8 +12,8 @@
12 12
13#include <stdio.h> 13#include <stdio.h>
14 14
15#ifndef _WIN32 15#ifdef _WIN32
16# include <dlfcn.h> 16# include <evil_private.h> /* dlopen */
17#endif 17#endif
18 18
19#define EFL_GFX_FILTER_BETA 19#define EFL_GFX_FILTER_BETA
diff --git a/src/tests/evas/evas_test_filters.c b/src/tests/evas/evas_test_filters.c
index f3c5fa8..f77e16a 100644
--- a/src/tests/evas/evas_test_filters.c
+++ b/src/tests/evas/evas_test_filters.c
@@ -9,6 +9,10 @@
9 9
10#include <stdio.h> 10#include <stdio.h>
11 11
12#ifdef _WIN32
13# include <evil_private.h> /* setenv */
14#endif
15
12#define EFL_GFX_FILTER_BETA 16#define EFL_GFX_FILTER_BETA
13 17
14#include "../../lib/evas/include/evas_common_private.h" 18#include "../../lib/evas/include/evas_common_private.h"