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

win32: cleanup 8.3 disabled tests

Browse Source
This commit is contained in:
Edward Thomson 2015-02-03 12:16:11 -05:00
parent 9dcc4a36f7
commit 5f28ec84a1
3 changed files with 16 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/repository.c
View File

@ -808,7 +808,8 @@ const char *git_repository__8dot3_name(git_repository *repo)
/* We anticipate the 8.3 name is "GIT~1", so use a static for
* easy testing in the common case */
if (repo->name_8dot3 && strcasecmp(repo->name_8dot3, git_repository__8dot3_default) == 0)
if (repo->name_8dot3 &&
strcasecmp(repo->name_8dot3, git_repository__8dot3_default) == 0)
repo->has_8dot3_default = 1;
}
#endif

30
tests/checkout/nasty.c
View File

@ -10,25 +10,6 @@ static const char *repo_name = "nasty";
static git_repository *repo;
static git_checkout_options checkout_opts;
#ifdef GIT_WIN32
static bool is_8dot3_disabled(void)
{
#define IS_8DOT3_BUF_SIZE (MAX_PATH + 20)
char src[IS_8DOT3_BUF_SIZE];
wchar_t dest[IS_8DOT3_BUF_SIZE], shortPath[IS_8DOT3_BUF_SIZE];
FILE *fp;
strcpy_s(src, IS_8DOT3_BUF_SIZE, clar_sandbox_path());
strcat_s(src, IS_8DOT3_BUF_SIZE, "/longer_than_8dot3");
git__utf8_to_16(dest, IS_8DOT3_BUF_SIZE, src);
fp = _wfopen(dest, L"w");
cl_assert(fp);
fclose(fp);
cl_assert(GetShortPathNameW(dest, shortPath, IS_8DOT3_BUF_SIZE) > 0);
DeleteFileW(dest);
return !wcscmp(dest, shortPath);
}
#endif
void test_checkout_nasty__initialize(void)
{
repo = cl_git_sandbox_init(repo_name);
@ -236,13 +217,16 @@ void test_checkout_nasty__git_tilde1(void)
void test_checkout_nasty__git_custom_shortname(void)
{
#ifdef GIT_WIN32
char *shortname = git_win32_path_8dot3_name("C:\\Program Files");
if (shortname == NULL)
clar__skip();
git__free(shortname);
cl_must_pass(p_rename("nasty/.git", "nasty/_temp"));
cl_git_write2file("nasty/git~1", "", 0, O_RDWR|O_CREAT, 0666);
cl_must_pass(p_rename("nasty/_temp", "nasty/.git"));
if (is_8dot3_disabled())
test_checkout_passes("refs/heads/git_tilde2", ".git/foobar");
else
test_checkout_fails("refs/heads/git_tilde2", ".git/foobar");
test_checkout_fails("refs/heads/git_tilde2", ".git/foobar");
#endif
}

23
tests/path/win32.c
View File

@ -4,18 +4,6 @@
#ifdef GIT_WIN32
#include "win32/path_w32.h"
static bool is_8dot3_disabled(void)
{
wchar_t shortPath[MAX_PATH];
wchar_t *dest = L"longer_than_8dot3";
FILE *fp = _wfopen(dest, L"w");
cl_assert(fp);
fclose(fp);
cl_assert(GetShortPathNameW(dest, shortPath, MAX_PATH) > 0);
DeleteFileW(dest);
return !wcscmp(dest, shortPath);
}
#endif
void test_utf8_to_utf16(const char *utf8_in, const wchar_t *utf16_expected)
@ -205,11 +193,14 @@ void test_path_win32__8dot3_name(void)
{
#ifdef GIT_WIN32
char *shortname;
bool disable8dot3 = is_8dot3_disabled();
/* Some guaranteed short names */
shortname = git_win32_path_8dot3_name("C:\\Program Files");
cl_assert(!shortname || !strcmp(shortname, "PROGRA~1")); // null when 8.3 stripped, otherwise in 8.3 format
if (shortname == NULL)
clar__skip();
cl_assert_equal_s("PROGRA~1", shortname);
git__free(shortname);
cl_assert_equal_s("WINDOWS", (shortname = git_win32_path_8dot3_name("C:\\WINDOWS")));
@ -217,12 +208,12 @@ void test_path_win32__8dot3_name(void)
/* Create some predictible short names */
cl_must_pass(p_mkdir(".foo", 0777));
cl_assert_equal_s(disable8dot3 ? ".foo" : "FOO~1", (shortname = git_win32_path_8dot3_name(".foo")));
cl_assert_equal_s("FOO~1", (shortname = git_win32_path_8dot3_name(".foo")));
git__free(shortname);
cl_git_write2file("bar~1", "foobar\n", 7, O_RDWR|O_CREAT, 0666);
cl_must_pass(p_mkdir(".bar", 0777));
cl_assert_equal_s(disable8dot3 ? ".bar" : "BAR~2", (shortname = git_win32_path_8dot3_name(".bar")));
cl_assert_equal_s("BAR~2", (shortname = git_win32_path_8dot3_name(".bar")));
git__free(shortname);
#endif
}