Commit e566b609 by Eduardo Bart

Update clar tests p_lstat_posixly and p_lstat

parent 2d96fce2
...@@ -15,13 +15,6 @@ void test_core_stat__cleanup(void) ...@@ -15,13 +15,6 @@ void test_core_stat__cleanup(void)
git_futils_rmdir_r("root", NULL, GIT_RMDIR_REMOVE_FILES); git_futils_rmdir_r("root", NULL, GIT_RMDIR_REMOVE_FILES);
} }
#ifdef GIT_WIN32
#define cl_assert_last_error(val) \
do { werr = GetLastError(); cl_assert_equal_i((val), (int)werr); } while (0)
#else
#define cl_assert_last_error(val)
#endif
#define cl_assert_error(val) \ #define cl_assert_error(val) \
do { err = errno; cl_assert_equal_i((val), err); } while (0) do { err = errno; cl_assert_equal_i((val), err); } while (0)
...@@ -29,66 +22,45 @@ void test_core_stat__0(void) ...@@ -29,66 +22,45 @@ void test_core_stat__0(void)
{ {
struct stat st; struct stat st;
int err; int err;
#ifdef GIT_WIN32
DWORD werr;
#endif
cl_assert_equal_i(0, p_lstat("root", &st)); cl_assert_equal_i(0, p_lstat("root", &st));
cl_assert(S_ISDIR(st.st_mode)); cl_assert(S_ISDIR(st.st_mode));
cl_assert_last_error(0);
cl_assert_error(0); cl_assert_error(0);
cl_assert_equal_i(0, p_lstat("root/", &st)); cl_assert_equal_i(0, p_lstat("root/", &st));
cl_assert(S_ISDIR(st.st_mode)); cl_assert(S_ISDIR(st.st_mode));
cl_assert_last_error(0);
cl_assert_error(0); cl_assert_error(0);
cl_assert_equal_i(0, p_lstat("root/file", &st)); cl_assert_equal_i(0, p_lstat("root/file", &st));
cl_assert(S_ISREG(st.st_mode)); cl_assert(S_ISREG(st.st_mode));
cl_assert_last_error(0);
cl_assert_error(0); cl_assert_error(0);
cl_assert_equal_i(0, p_lstat("root/d1", &st)); cl_assert_equal_i(0, p_lstat("root/d1", &st));
cl_assert(S_ISDIR(st.st_mode)); cl_assert(S_ISDIR(st.st_mode));
cl_assert_last_error(0);
cl_assert_error(0); cl_assert_error(0);
cl_assert_equal_i(0, p_lstat("root/d1/", &st)); cl_assert_equal_i(0, p_lstat("root/d1/", &st));
cl_assert(S_ISDIR(st.st_mode)); cl_assert(S_ISDIR(st.st_mode));
cl_assert_last_error(0);
cl_assert_error(0); cl_assert_error(0);
cl_assert_equal_i(0, p_lstat("root/d1/file", &st)); cl_assert_equal_i(0, p_lstat("root/d1/file", &st));
cl_assert(S_ISREG(st.st_mode)); cl_assert(S_ISREG(st.st_mode));
cl_assert_last_error(0);
cl_assert_error(0); cl_assert_error(0);
cl_assert(p_lstat("root/missing", &st) < 0); cl_assert(p_lstat("root/missing", &st) < 0);
cl_assert_last_error(ERROR_FILE_NOT_FOUND);
cl_assert_error(ENOENT); cl_assert_error(ENOENT);
cl_assert(p_lstat("root/missing/but/could/be/created", &st) < 0); cl_assert(p_lstat("root/missing/but/could/be/created", &st) < 0);
cl_assert_last_error(ERROR_PATH_NOT_FOUND);
#ifdef GIT_WIN32
cl_assert_error(ENOTDIR);
#else
cl_assert_error(ENOENT); cl_assert_error(ENOENT);
#endif
cl_assert(p_lstat_posixly("root/missing/but/could/be/created", &st) < 0); cl_assert(p_lstat_posixly("root/missing/but/could/be/created", &st) < 0);
cl_assert_error(ENOENT); cl_assert_error(ENOENT);
cl_assert(p_lstat("root/d1/missing", &st) < 0); cl_assert(p_lstat("root/d1/missing", &st) < 0);
cl_assert_last_error(ERROR_FILE_NOT_FOUND);
cl_assert_error(ENOENT); cl_assert_error(ENOENT);
cl_assert(p_lstat("root/d1/missing/deeper/path", &st) < 0); cl_assert(p_lstat("root/d1/missing/deeper/path", &st) < 0);
cl_assert_last_error(ERROR_PATH_NOT_FOUND);
#ifdef GIT_WIN32
cl_assert_error(ENOTDIR);
#else
cl_assert_error(ENOENT); cl_assert_error(ENOENT);
#endif
cl_assert(p_lstat_posixly("root/d1/missing/deeper/path", &st) < 0); cl_assert(p_lstat_posixly("root/d1/missing/deeper/path", &st) < 0);
cl_assert_error(ENOENT); cl_assert_error(ENOENT);
...@@ -97,13 +69,21 @@ void test_core_stat__0(void) ...@@ -97,13 +69,21 @@ void test_core_stat__0(void)
cl_assert_error(ENOTDIR); cl_assert_error(ENOTDIR);
cl_assert(p_lstat("root/file/invalid", &st) < 0); cl_assert(p_lstat("root/file/invalid", &st) < 0);
#ifdef GIT_WIN32
cl_assert_error(ENOENT);
#else
cl_assert_error(ENOTDIR); cl_assert_error(ENOTDIR);
#endif
cl_assert(p_lstat_posixly("root/file/invalid", &st) < 0); cl_assert(p_lstat_posixly("root/file/invalid", &st) < 0);
cl_assert_error(ENOTDIR); cl_assert_error(ENOTDIR);
cl_assert(p_lstat("root/file/invalid/deeper_path", &st) < 0); cl_assert(p_lstat("root/file/invalid/deeper_path", &st) < 0);
#ifdef GIT_WIN32
cl_assert_error(ENOENT);
#else
cl_assert_error(ENOTDIR); cl_assert_error(ENOTDIR);
#endif
cl_assert(p_lstat_posixly("root/file/invalid/deeper_path", &st) < 0); cl_assert(p_lstat_posixly("root/file/invalid/deeper_path", &st) < 0);
cl_assert_error(ENOTDIR); cl_assert_error(ENOTDIR);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment