proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-13 23:05:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up system file finding tests on Win32

Browse Source
This commit is contained in:
Russell Belfer 2012-05-24 15:08:55 -07:00
parent 349fb6d7ac
commit 9cde607c95
2 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fileops.c
View File

@ -415,7 +415,7 @@ int git_futils_find_system_file(git_buf *path, const char *filename)
{ {
#ifdef GIT_WIN32 #ifdef GIT_WIN32
struct win32_path root; struct win32_path root;
if (win32_expand_path(&root, L"%PROGRAMFILES%\\Git\\etc\\") < 0 || if (win32_expand_path(&root, L"%PROGRAMFILES%\\Git\\etc\\") < 0 ||
win32_find_file(path, &root, filename) < 0) { win32_find_file(path, &root, filename) < 0) {
giterr_set(GITERR_OS, "Cannot find the system's Program Files directory"); giterr_set(GITERR_OS, "Cannot find the system's Program Files directory");

29
tests-clar/core/env.c
View File

@ -53,26 +53,24 @@ static int cl_setenv(const char *name, const char *value)
#endif #endif
static char *env_home = NULL; static char *env_home = NULL;
#ifdef GIT_WIN32
static char *env_userprofile = NULL; static char *env_userprofile = NULL;
#endif
void test_core_env__initialize(void) void test_core_env__initialize(void)
{ {
env_home = cl_getenv("HOME");
#ifdef GIT_WIN32 #ifdef GIT_WIN32
env_userprofile = cl_getenv("USERPROFILE"); env_userprofile = cl_getenv("USERPROFILE");
#else
env_home = cl_getenv("HOME");
#endif #endif
} }
void test_core_env__cleanup(void) void test_core_env__cleanup(void)
{ {
cl_setenv("HOME", env_home);
#ifdef GIT_WIN32 #ifdef GIT_WIN32
cl_setenv("USERPROFILE", env_userprofile); cl_setenv("USERPROFILE", env_userprofile);
git__free(env_home);
git__free(env_userprofile); git__free(env_userprofile);
#else
cl_setenv("HOME", env_home);
#endif #endif
} }
@ -102,32 +100,25 @@ void test_core_env__0(void)
*/ */
cl_git_pass(git_path_prettify(&path, *val, NULL)); cl_git_pass(git_path_prettify(&path, *val, NULL));
cl_git_pass(cl_setenv("HOME", path.ptr));
/* do a quick check that it was set correctly */
check = cl_getenv("HOME");
cl_assert_equal_s(path.ptr, check);
#ifdef GIT_WIN32 #ifdef GIT_WIN32
git__free(check);
cl_git_pass(cl_setenv("USERPROFILE", path.ptr)); cl_git_pass(cl_setenv("USERPROFILE", path.ptr));
/* do a quick check that it was set correctly */ /* do a quick check that it was set correctly */
check = cl_getenv("USERPROFILE"); check = cl_getenv("USERPROFILE");
cl_assert_equal_s(path.ptr, check); cl_assert_equal_s(path.ptr, check);
git__free(check); git__free(check);
#else
cl_git_pass(cl_setenv("HOME", path.ptr));
/* do a quick check that it was set correctly */
check = cl_getenv("HOME");
cl_assert_equal_s(path.ptr, check);
#endif #endif
cl_git_pass(git_buf_puts(&path, "/testfile")); cl_git_pass(git_buf_puts(&path, "/testfile"));
cl_git_mkfile(path.ptr, "find me"); cl_git_mkfile(path.ptr, "find me");
cl_git_pass(git_futils_find_global_file(&found, "testfile")); cl_git_pass(git_futils_find_global_file(&found, "testfile"));
#ifdef GIT_WIN32
/* do another check with HOME unset */
cl_git_pass(cl_setenv("HOME", NULL));
cl_git_pass(git_futils_find_global_file(&found, "testfile"));
#endif
} }
} }