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

test: Don't be so picky with failed lookups

Browse Source 
Not found means not found, and the other way around.
This commit is contained in:
Vicent Marti 2012-10-16 19:34:29 +02:00
parent a891841850
commit 18217e7e8a
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/fileops.c
View File

@ -418,14 +418,14 @@ int git_futils_find_global_file(git_buf *path, const char *filename)
root.path[0] == L'%') /* i.e. no expansion happened */ root.path[0] == L'%') /* i.e. no expansion happened */
{ {
giterr_set(GITERR_OS, "Cannot locate the user's profile directory"); giterr_set(GITERR_OS, "Cannot locate the user's profile directory");
return -1; return GIT_ENOTFOUND;
} }
} else { } else {
if (win32_expand_path(&root, L"%USERPROFILE%\\") < 0 || if (win32_expand_path(&root, L"%USERPROFILE%\\") < 0 ||
root.path[0] == L'%') /* i.e. no expansion happened */ root.path[0] == L'%') /* i.e. no expansion happened */
{ {
giterr_set(GITERR_OS, "Cannot locate the user's profile directory"); giterr_set(GITERR_OS, "Cannot locate the user's profile directory");
return -1; return GIT_ENOTFOUND;
} }
} }
@ -440,7 +440,7 @@ int git_futils_find_global_file(git_buf *path, const char *filename)
if (home == NULL) { if (home == NULL) {
giterr_set(GITERR_OS, "Global file lookup failed. " giterr_set(GITERR_OS, "Global file lookup failed. "
"Cannot locate the user's home directory"); "Cannot locate the user's home directory");
return -1; return GIT_ENOTFOUND;
} }
if (git_buf_joinpath(path, home, filename) < 0) if (git_buf_joinpath(path, home, filename) < 0)

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

@ -87,7 +87,7 @@ void test_core_env__1(void)
{ {
git_buf path = GIT_BUF_INIT; git_buf path = GIT_BUF_INIT;
cl_assert(git_futils_find_global_file(&path, "nonexistentfile") == GIT_ENOTFOUND); cl_must_fail(git_futils_find_global_file(&path, "nonexistentfile"));
#ifdef GIT_WIN32 #ifdef GIT_WIN32
cl_git_pass(cl_setenv("USERPROFILE", "doesnotexist")); cl_git_pass(cl_setenv("USERPROFILE", "doesnotexist"));
@ -95,7 +95,7 @@ void test_core_env__1(void)
cl_git_pass(cl_setenv("HOME", "doesnotexist")); cl_git_pass(cl_setenv("HOME", "doesnotexist"));
#endif #endif
cl_assert(git_futils_find_global_file(&path, "nonexistentfile") == GIT_ENOTFOUND); cl_must_fail(git_futils_find_global_file(&path, "nonexistentfile"));
#ifdef GIT_WIN32 #ifdef GIT_WIN32
cl_git_pass(cl_setenv("USERPROFILE", NULL)); cl_git_pass(cl_setenv("USERPROFILE", NULL));
@ -103,14 +103,12 @@ void test_core_env__1(void)
cl_git_pass(cl_setenv("HOME", NULL)); cl_git_pass(cl_setenv("HOME", NULL));
#endif #endif
cl_assert(git_futils_find_global_file(&path, "nonexistentfile") == -1); cl_must_fail(git_futils_find_global_file(&path, "nonexistentfile"));
cl_must_fail(git_futils_find_system_file(&path, "nonexistentfile"));
cl_assert(git_futils_find_system_file(&path, "nonexistentfile") == GIT_ENOTFOUND);
#ifdef GIT_WIN32 #ifdef GIT_WIN32
cl_git_pass(cl_setenv("PROGRAMFILES", NULL)); cl_git_pass(cl_setenv("PROGRAMFILES", NULL));
cl_must_fail(git_futils_find_system_file(&path, "nonexistentfile"));
cl_assert(git_futils_find_system_file(&path, "nonexistentfile") == -1);
#endif #endif
git_buf_free(&path); git_buf_free(&path);