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

diff --git a/src/tests/ecore/ecore_test_ecore.c b/src/tests/ecore/ecore_test_ecore.c
index 81ed6a9..9befe83 100644 (file)
--- a/src/tests/ecore/ecore_test_ecore.c
+++ b/src/tests/ecore/ecore_test_ecore.c
@@ -5,6 +5,10 @@
 #include <stdio.h>
 #include <unistd.h>
 
+#ifdef _WIN32
+# include <evil_private.h> /* pipe */
+#endif
+
 #include <Eina.h>
 #include <Ecore.h>
 

diff --git a/src/tests/ecore/ecore_test_ecore_file.c b/src/tests/ecore/ecore_test_ecore_file.c
index 8fff2eb..fe0e73f 100644 (file)
--- a/src/tests/ecore/ecore_test_ecore_file.c
+++ b/src/tests/ecore/ecore_test_ecore_file.c
@@ -9,6 +9,10 @@
 #include <fcntl.h>
 #include <libgen.h>
 
+#ifdef _WIN32
+# include <evil_private.h> /* setenv */
+#endif
+
 #include <Eina.h>
 #include <Ecore.h>
 #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 b1e6a57..85ff20b 100644 (file)
--- 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 @@
 #include <stdio.h>
 #include <unistd.h>
 
+#ifdef _WIN32
+# include <evil_private.h> /* pipe */
+#endif
+
 #include <Eina.h>
 #include <Ecore.h>
 

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 (file)
--- a/src/tests/ecore/efl_app_test_loop_fd.c
+++ b/src/tests/ecore/efl_app_test_loop_fd.c
@@ -4,6 +4,11 @@
 
 #include <stdio.h>
 #include <unistd.h>
+
+#ifdef _WIN32
+# include <evil_private.h> /* pipe */
+#endif
+
 #define EFL_NOLEGACY_API_SUPPORT
 #include <Efl_Core.h>
 #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 (file)
--- 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 @@
 
 #include <stdio.h>
 
+#ifdef _WIN32
+# include <evil_private.h> /* setenv unsetenv */
+#endif
+
 #include <Ecore.h>
 #include <Ecore_Con.h>
 

diff --git a/src/tests/edje/edje_test_features.c b/src/tests/edje/edje_test_features.c
index 449e97e..4b6ddb8 100644 (file)
--- a/src/tests/edje/edje_test_features.c
+++ b/src/tests/edje/edje_test_features.c
@@ -5,6 +5,10 @@
 #include <unistd.h>
 #include <stdio.h>
 
+#ifdef _WIN32
+# include <evil_private.h> /* setenv realpath */
+#endif
+
 #define EFL_GFX_FILTER_BETA
 #define EFL_CANVAS_LAYOUT_BETA
 

diff --git a/src/tests/efreet/ef_data_dirs.c b/src/tests/efreet/ef_data_dirs.c
index d79b742..4a0fa03 100644 (file)
--- a/src/tests/efreet/ef_data_dirs.c
+++ b/src/tests/efreet/ef_data_dirs.c
@@ -6,6 +6,10 @@
 #include <stdio.h>
 #include <string.h>
 
+#ifdef _WIN32
+# include <evil_private.h> /* setenv unsetenv */
+#endif
+
 #include <Ecore_File.h>
 #include <Efreet.h>
 

diff --git a/src/tests/efreet/ef_icon_theme.c b/src/tests/efreet/ef_icon_theme.c
index 7b4cb5b..25e0e66 100644 (file)
--- a/src/tests/efreet/ef_icon_theme.c
+++ b/src/tests/efreet/ef_icon_theme.c
@@ -7,6 +7,10 @@
 #include <string.h>
 #include <limits.h>
 
+#ifdef _WIN32
+# include <evil_private.h> /* unsetenv */
+#endif
+
 #include <Ecore.h>
 #include <Ecore_File.h>
 #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 (file)
--- a/src/tests/eina/eina_test_file.c
+++ b/src/tests/eina/eina_test_file.c
@@ -28,7 +28,7 @@
 #include <fcntl.h>
 
 #ifdef _WIN32
-# include <windows.h>
+# include <evil_private.h> /* mkdir */
 #endif
 
 #include <Eina.h>
@@ -724,7 +724,10 @@ EFL_END_TEST
 EFL_START_TEST(eina_test_file_mktemp)
 {
    Eina_Tmpstr *tmpfile, *tmpdir = NULL;
-   char buf[PATH_MAX], fmt[256];
+   char buf[PATH_MAX];
+#ifndef _WIN32
+   char fmt[256];
+#endif
    Eina_File_Direct_Info *info;
    Eina_Iterator *it;
    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 (file)
--- a/src/tests/eio/eio_test_common.c
+++ b/src/tests/eio/eio_test_common.c
@@ -8,6 +8,10 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
+#ifdef _WIN32
+# include <evil_private.h> /* mkdir */
+#endif
+
 #include "eio_suite.h"
 #include "eio_test_common.h"
 

diff --git a/src/tests/eio/eio_test_manager.c b/src/tests/eio/eio_test_manager.c
index 79a6c2e..fb6c7f4 100644 (file)
--- 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,
 
         fail_if(!eina_value_struct_get(&st, "mode", &mode));
         fail_if(S_ISDIR(mode) != *is_dir);
+        /* no symbolic link on Windows */
+#ifndef _WIN32
         fail_if(S_ISLNK(mode));
+#endif
 
         rights = mode & (S_IRWXU | S_IRWXG | S_IRWXO);
         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 (file)
--- 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)
    tcase_add_test(tc, eio_test_monitor_directory_multi_file_created_notify);
    tcase_add_test(tc, eio_test_monitor_directory_file_deleted_notify);
    tcase_add_test(tc, eio_test_monitor_directory_file_modified_notify);
-#if !defined(_WIN32) && !defined(__MACH__)
+#if !defined(__MACH__)
    tcase_add_test(tc, eio_test_monitor_directory_file_closed_notify);
 #endif
    tcase_add_test(tc, eio_test_monitor_directory_directory_created_notify);
@@ -781,7 +781,7 @@ void eio_test_monitor(TCase *tc)
 
    tcase_add_test(tc, eio_test_monitor_file_file_modified_notify);
    tcase_add_test(tc, eio_test_monitor_file_file_attrib_modified_notify);
-#if !defined(_WIN32) && !defined(__MACH__)
+#if !defined(__MACH__)
    tcase_add_test(tc, eio_test_monitor_file_file_closed_notify);
 #endif
 #ifndef __MACH__

diff --git a/src/tests/eio/eio_test_sentry.c b/src/tests/eio/eio_test_sentry.c
index 5bdf341..5e21075 100644 (file)
--- 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)
    tcase_add_test(tc, eio_test_sentry_directory_file_created_notify);
    tcase_add_test(tc, eio_test_sentry_directory_file_deleted_notify);
    tcase_add_test(tc, eio_test_sentry_directory_file_modified_notify);
-#if !defined(_WIN32) && !defined(__MACH__)
+#if !defined(__MACH__)
    tcase_add_test(tc, eio_test_sentry_directory_file_closed_notify);
 #endif
    tcase_add_test(tc, eio_test_sentry_directory_directory_created_notify);
@@ -686,7 +686,7 @@ void eio_test_sentry(TCase *tc)
 
    tcase_add_test(tc, eio_test_sentry_file_file_modified_notify);
    tcase_add_test(tc, eio_test_sentry_file_file_attrib_modified_notify);
-#if !defined(_WIN32) && !defined(__MACH__)
+#if !defined(__MACH__)
    tcase_add_test(tc, eio_test_sentry_file_file_closed_notify);
 #endif
 #ifndef __MACH__

diff --git a/src/tests/elua/elua_lib.c b/src/tests/elua/elua_lib.c
index c39d056..f3d11d5 100644 (file)
--- a/src/tests/elua/elua_lib.c
+++ b/src/tests/elua/elua_lib.c
@@ -6,6 +6,10 @@
 #include <stdio.h>
 #include <unistd.h>
 
+#ifdef _WIN32
+# include <evil_private.h> /* setenv unsetenv */
+#endif
+
 #include <Eina.h>
 #include <Elua.h>
 

diff --git a/src/tests/elua/elua_suite.c b/src/tests/elua/elua_suite.c
index 0ed47f8..b1dcc23 100644 (file)
--- a/src/tests/elua/elua_suite.c
+++ b/src/tests/elua/elua_suite.c
@@ -2,6 +2,10 @@
 # include <config.h>
 #endif
 
+#ifdef _WIN32
+# include <evil_private.h> /* setenv unsetenv */
+#endif
+
 #include "elua_suite.h"
 #include "../efl_check.h"
 #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 (file)
--- 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
 static void _null_fct(Eo *eo_obj EINA_UNUSED, void *d EINA_UNUSED) { }
 void null_fct (void) {}
 
+/* This test is not relevant for WIN32. */
+#ifndef _WIN32
 static Eina_Bool
 _null_class_initializer(Efl_Class *klass)
 {
@@ -231,6 +233,7 @@ EFL_START_TEST(eo_null_api)
 
 }
 EFL_END_TEST
+#endif
 
 static Eina_Bool
 _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 (file)
--- a/src/tests/eolian/eolian_parsing.c
+++ b/src/tests/eolian/eolian_parsing.c
@@ -5,6 +5,10 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#ifdef _WIN32
+# include <evil_private.h> /* setenv unsetenv */
+#endif
+
 #include <Eina.h>
 #include <Eolian.h>
 

diff --git a/src/tests/evas/evas_test_evasgl.c b/src/tests/evas/evas_test_evasgl.c
index 603ed87..07b8864 100644 (file)
--- a/src/tests/evas/evas_test_evasgl.c
+++ b/src/tests/evas/evas_test_evasgl.c
@@ -12,8 +12,8 @@
 
 #include <stdio.h>
 
-#ifndef _WIN32
-# include <dlfcn.h>
+#ifdef _WIN32
+# include <evil_private.h> /* dlopen */
 #endif
 
 #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 (file)
--- a/src/tests/evas/evas_test_filters.c
+++ b/src/tests/evas/evas_test_filters.c
@@ -9,6 +9,10 @@
 
 #include <stdio.h>
 
+#ifdef _WIN32
+# include <evil_private.h> /* setenv */
+#endif
+
 #define EFL_GFX_FILTER_BETA
 
 #include "../../lib/evas/include/evas_common_private.h"