core::link test: clean up junction point name
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 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194
diff --git a/tests/core/link.c b/tests/core/link.c
index 1794a38..83999eb 100644
--- a/tests/core/link.c
+++ b/tests/core/link.c
@@ -23,7 +23,7 @@ void test_core_link__cleanup(void)
}
#ifdef GIT_WIN32
-static bool is_administrator(void)
+static bool should_run(void)
{
static SID_IDENTIFIER_AUTHORITY authority = { SECURITY_NT_AUTHORITY };
PSID admin_sid;
@@ -35,6 +35,11 @@ static bool is_administrator(void)
return is_admin ? true : false;
}
+#else
+static bool should_run(void)
+{
+ return true;
+}
#endif
static void do_symlink(const char *old, const char *new, int is_dir)
@@ -48,9 +53,6 @@ static void do_symlink(const char *old, const char *new, int is_dir)
HMODULE module;
create_symlink_func pCreateSymbolicLink;
- if (!is_administrator())
- clar__skip();
-
cl_assert(module = GetModuleHandle("kernel32"));
cl_assert(pCreateSymbolicLink = (create_symlink_func)GetProcAddress(module, "CreateSymbolicLinkA"));
@@ -67,9 +69,6 @@ static void do_hardlink(const char *old, const char *new)
HMODULE module;
create_hardlink_func pCreateHardLink;
- if (!is_administrator())
- clar__skip();
-
cl_assert(module = GetModuleHandle("kernel32"));
cl_assert(pCreateHardLink = (create_hardlink_func)GetProcAddress(module, "CreateHardLinkA"));
@@ -147,6 +146,8 @@ static void do_junction(const char *old, const char *new)
CloseHandle(handle);
LocalFree(reparse_buf);
+
+ git_buf_free(&unparsed_buf);
}
static void do_custom_reparse(const char *path)
@@ -235,6 +236,9 @@ void test_core_link__stat_symlink(void)
{
struct stat st;
+ if (!should_run())
+ clar__skip();
+
cl_git_rewritefile("stat_target", "This is the target of a symbolic link.\n");
do_symlink("stat_target", "stat_symlink", 0);
@@ -251,6 +255,9 @@ void test_core_link__stat_symlink_directory(void)
{
struct stat st;
+ if (!should_run())
+ clar__skip();
+
p_mkdir("stat_dirtarget", 0777);
do_symlink("stat_dirtarget", "stat_dirlink", 1);
@@ -265,6 +272,9 @@ void test_core_link__stat_symlink_chain(void)
{
struct stat st;
+ if (!should_run())
+ clar__skip();
+
cl_git_rewritefile("stat_final_target", "Final target of some symbolic links...\n");
do_symlink("stat_final_target", "stat_chain_3", 0);
do_symlink("stat_chain_3", "stat_chain_2", 0);
@@ -279,6 +289,9 @@ void test_core_link__stat_dangling_symlink(void)
{
struct stat st;
+ if (!should_run())
+ clar__skip();
+
do_symlink("stat_nonexistent", "stat_dangling", 0);
cl_must_fail(p_stat("stat_nonexistent", &st));
@@ -289,6 +302,9 @@ void test_core_link__stat_dangling_symlink_directory(void)
{
struct stat st;
+ if (!should_run())
+ clar__skip();
+
do_symlink("stat_nonexistent", "stat_dangling_dir", 1);
cl_must_fail(p_stat("stat_nonexistent_dir", &st));
@@ -300,6 +316,9 @@ void test_core_link__lstat_symlink(void)
git_buf target_path = GIT_BUF_INIT;
struct stat st;
+ if (!should_run())
+ clar__skip();
+
/* Windows always writes the canonical path as the link target, so
* write the full path on all platforms.
*/
@@ -324,6 +343,9 @@ void test_core_link__lstat_symlink_directory(void)
git_buf target_path = GIT_BUF_INIT;
struct stat st;
+ if (!should_run())
+ clar__skip();
+
git_buf_join(&target_path, '/', clar_sandbox_path(), "lstat_dirtarget");
p_mkdir("lstat_dirtarget", 0777);
@@ -343,6 +365,9 @@ void test_core_link__lstat_dangling_symlink(void)
{
struct stat st;
+ if (!should_run())
+ clar__skip();
+
do_symlink("lstat_nonexistent", "lstat_dangling", 0);
cl_must_fail(p_lstat("lstat_nonexistent", &st));
@@ -356,6 +381,9 @@ void test_core_link__lstat_dangling_symlink_directory(void)
{
struct stat st;
+ if (!should_run())
+ clar__skip();
+
do_symlink("lstat_nonexistent", "lstat_dangling_dir", 1);
cl_must_fail(p_lstat("lstat_nonexistent", &st));
@@ -454,6 +482,9 @@ void test_core_link__stat_hardlink(void)
{
struct stat st;
+ if (!should_run())
+ clar__skip();
+
cl_git_rewritefile("stat_hardlink1", "This file has many names!\n");
do_hardlink("stat_hardlink1", "stat_hardlink2");
@@ -470,6 +501,9 @@ void test_core_link__lstat_hardlink(void)
{
struct stat st;
+ if (!should_run())
+ clar__skip();
+
cl_git_rewritefile("lstat_hardlink1", "This file has many names!\n");
do_hardlink("lstat_hardlink1", "lstat_hardlink2");
@@ -537,6 +571,9 @@ void test_core_link__readlink_symlink(void)
int len;
char buf[2048];
+ if (!should_run())
+ clar__skip();
+
git_buf_join(&target_path, '/', clar_sandbox_path(), "readlink_target");
cl_git_rewritefile("readlink_target", "This is the target of a symlink\n");
@@ -558,6 +595,9 @@ void test_core_link__readlink_dangling(void)
int len;
char buf[2048];
+ if (!should_run())
+ clar__skip();
+
git_buf_join(&target_path, '/', clar_sandbox_path(), "readlink_nonexistent");
do_symlink(git_buf_cstr(&target_path), "readlink_dangling", 0);
@@ -579,6 +619,9 @@ void test_core_link__readlink_multiple(void)
int len;
char buf[2048];
+ if (!should_run())
+ clar__skip();
+
git_buf_join(&target_path, '/', clar_sandbox_path(), "readlink_final");
git_buf_join(&path3, '/', clar_sandbox_path(), "readlink_3");
git_buf_join(&path2, '/', clar_sandbox_path(), "readlink_2");