Commit e566b609df9c45994fa43c8f7a97bd4090a9b11e
2012-11-20T00:57:56
Update clar tests p_lstat_posixly and p_lstat
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107
diff --git a/tests-clar/core/stat.c b/tests-clar/core/stat.c
index cbfc66c..2e4abfb 100644
--- a/tests-clar/core/stat.c
+++ b/tests-clar/core/stat.c
@@ -15,13 +15,6 @@ void test_core_stat__cleanup(void)
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) \
do { err = errno; cl_assert_equal_i((val), err); } while (0)
@@ -29,66 +22,45 @@ void test_core_stat__0(void)
{
struct stat st;
int err;
-#ifdef GIT_WIN32
- DWORD werr;
-#endif
cl_assert_equal_i(0, p_lstat("root", &st));
cl_assert(S_ISDIR(st.st_mode));
- cl_assert_last_error(0);
cl_assert_error(0);
cl_assert_equal_i(0, p_lstat("root/", &st));
cl_assert(S_ISDIR(st.st_mode));
- cl_assert_last_error(0);
cl_assert_error(0);
cl_assert_equal_i(0, p_lstat("root/file", &st));
cl_assert(S_ISREG(st.st_mode));
- cl_assert_last_error(0);
cl_assert_error(0);
cl_assert_equal_i(0, p_lstat("root/d1", &st));
cl_assert(S_ISDIR(st.st_mode));
- cl_assert_last_error(0);
cl_assert_error(0);
cl_assert_equal_i(0, p_lstat("root/d1/", &st));
cl_assert(S_ISDIR(st.st_mode));
- cl_assert_last_error(0);
cl_assert_error(0);
cl_assert_equal_i(0, p_lstat("root/d1/file", &st));
cl_assert(S_ISREG(st.st_mode));
- cl_assert_last_error(0);
cl_assert_error(0);
cl_assert(p_lstat("root/missing", &st) < 0);
- cl_assert_last_error(ERROR_FILE_NOT_FOUND);
cl_assert_error(ENOENT);
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);
-#endif
cl_assert(p_lstat_posixly("root/missing/but/could/be/created", &st) < 0);
cl_assert_error(ENOENT);
cl_assert(p_lstat("root/d1/missing", &st) < 0);
- cl_assert_last_error(ERROR_FILE_NOT_FOUND);
cl_assert_error(ENOENT);
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);
-#endif
cl_assert(p_lstat_posixly("root/d1/missing/deeper/path", &st) < 0);
cl_assert_error(ENOENT);
@@ -97,13 +69,21 @@ void test_core_stat__0(void)
cl_assert_error(ENOTDIR);
cl_assert(p_lstat("root/file/invalid", &st) < 0);
+#ifdef GIT_WIN32
+ cl_assert_error(ENOENT);
+#else
cl_assert_error(ENOTDIR);
+#endif
cl_assert(p_lstat_posixly("root/file/invalid", &st) < 0);
cl_assert_error(ENOTDIR);
cl_assert(p_lstat("root/file/invalid/deeper_path", &st) < 0);
+#ifdef GIT_WIN32
+ cl_assert_error(ENOENT);
+#else
cl_assert_error(ENOTDIR);
+#endif
cl_assert(p_lstat_posixly("root/file/invalid/deeper_path", &st) < 0);
cl_assert_error(ENOTDIR);