diff options
author | Linquize <linquize@yahoo.com.hk> | 2015-01-28 23:04:50 +0800 |
---|---|---|
committer | Linquize <linquize@yahoo.com.hk> | 2015-01-31 00:09:31 +0800 |
commit | 9dcc4a36f709f013ed111924754021fddfc933e6 (patch) | |
tree | d566a82a7d7d68c175e50ea71792e59b47d7991f | |
parent | 1ac5acdc695b837a921897a9d42acc75649cfd4f (diff) | |
download | libgit2-9dcc4a36f709f013ed111924754021fddfc933e6.tar.gz |
Fix test failures when 8.3 is disabled
-rw-r--r-- | src/repository.c | 2 | ||||
-rw-r--r-- | tests/checkout/nasty.c | 24 | ||||
-rw-r--r-- | tests/path/win32.c | 20 |
3 files changed, 41 insertions, 5 deletions
diff --git a/src/repository.c b/src/repository.c index d87ce730a..f338af76c 100644 --- a/src/repository.c +++ b/src/repository.c @@ -808,7 +808,7 @@ 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 (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 diff --git a/tests/checkout/nasty.c b/tests/checkout/nasty.c index bc25a3b52..5084b2118 100644 --- a/tests/checkout/nasty.c +++ b/tests/checkout/nasty.c @@ -10,6 +10,25 @@ 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); @@ -220,7 +239,10 @@ void test_checkout_nasty__git_custom_shortname(void) 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")); - test_checkout_fails("refs/heads/git_tilde2", ".git/foobar"); + if (is_8dot3_disabled()) + test_checkout_passes("refs/heads/git_tilde2", ".git/foobar"); + else + test_checkout_fails("refs/heads/git_tilde2", ".git/foobar"); #endif } diff --git a/tests/path/win32.c b/tests/path/win32.c index 22742f82d..63c19e3e1 100644 --- a/tests/path/win32.c +++ b/tests/path/win32.c @@ -4,6 +4,18 @@ #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) @@ -193,9 +205,11 @@ void test_path_win32__8dot3_name(void) { #ifdef GIT_WIN32 char *shortname; + bool disable8dot3 = is_8dot3_disabled(); /* Some guaranteed short names */ - cl_assert_equal_s("PROGRA~1", (shortname = git_win32_path_8dot3_name("C:\\Program Files"))); + 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 git__free(shortname); cl_assert_equal_s("WINDOWS", (shortname = git_win32_path_8dot3_name("C:\\WINDOWS"))); @@ -203,12 +217,12 @@ void test_path_win32__8dot3_name(void) /* Create some predictible short names */ cl_must_pass(p_mkdir(".foo", 0777)); - cl_assert_equal_s("FOO~1", (shortname = git_win32_path_8dot3_name(".foo"))); + cl_assert_equal_s(disable8dot3 ? ".foo" : "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("BAR~2", (shortname = git_win32_path_8dot3_name(".bar"))); + cl_assert_equal_s(disable8dot3 ? ".bar" : "BAR~2", (shortname = git_win32_path_8dot3_name(".bar"))); git__free(shortname); #endif } |