enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

Revert "ecore: fix path comparison in Ecore_File test suite." 

This reverts commit 66c0f3261d.

This commit breaks the eina_file suite on Gentoo (our jenkins OS).

ref T2105
This commit is contained in:
Stefan Schmidt 2015-02-12 09:52:21 +01:00
parent 8c7c48a3f7
commit 46829c05fe
1 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/tests/ecore/ecore_test_ecore_file.c
View File

@ -55,29 +55,6 @@ get_tmp_file()
return tmp_file;
}
int
_compare_path(const char *filePathA, const char *filePathB)
{
char realFilePathA[MAXSIZE];
char realFilePathB[MAXSIZE];
#ifdef _WIN32
GetFullPathName(filePathA, MAXSIZE, realFilePathA, NULL);
GetFullPathName(filePathB, MAXSIZE, realFilePathB, NULL);
#else
realpath(filePathA, realFilePathA);
realpath(filePathB, realFilePathB);
#endif
return strcmp(realFilePathA, realFilePathB);
}
#define assert_path_eq(X, Y) \
do { \
const char* _ck_x = (X); \
const char* _ck_y = (Y); \
ck_assert_msg(0 == _compare_path(_ck_y, _ck_x), \
"Assertion '%s' failed: %s==\"%s\", %s==\"%s\"", #X"=="#Y, #X, _ck_x, #Y, _ck_y); \
} while (0)
static void
file_monitor_cb(void *data EINA_UNUSED, Ecore_File_Monitor *em EINA_UNUSED,
Ecore_File_Event event, const char *path)
@ -227,8 +204,8 @@ START_TEST(ecore_test_ecore_file_operations)
res = ecore_file_symlink(src_file, dest_file);
fail_if(res != EINA_TRUE);
assert_path_eq(ecore_file_readlink(dest_file), src_file);
assert_path_eq(ecore_file_realpath(dest_file), src_file);
ck_assert_str_eq(ecore_file_readlink(dest_file), src_file);
ck_assert_str_eq(ecore_file_realpath(dest_file), src_file);
res = ecore_file_unlink(dest_file);
fail_if(res != EINA_TRUE);
@ -241,8 +218,8 @@ START_TEST(ecore_test_ecore_file_operations)
res = ecore_file_exists(src_file);
fail_if(res != EINA_FALSE);
assert_path_eq(ecore_file_dir_get(dest_file), tmpdir);
assert_path_eq(ecore_file_realpath(dest_file), dest_file);
ck_assert_str_eq(ecore_file_dir_get(dest_file), tmpdir);
ck_assert_str_eq(ecore_file_realpath(dest_file), dest_file);
fail_if(ecore_file_mod_time(dest_file) == 0);
fail_if(ecore_file_can_read(dest_file) != EINA_TRUE);
fail_if(ecore_file_can_write(dest_file) != EINA_TRUE);
@ -286,7 +263,7 @@ START_TEST(ecore_test_ecore_file_monitor)
_writeToFile(file_name, random_text);
_writeToFile(file_name, random_text);
assert_path_eq(ecore_file_monitor_path_get(mon), realp);
ck_assert_str_eq(ecore_file_monitor_path_get(mon), realp);
ret = ecore_file_mksubdirs(src_dir, sub_dir);
fail_if(ret != 1);