win32: further cleanups for 8.3 disabling

4 files changed, 30 insertions, 9 deletions

diff --git a/tests/checkout/nasty.c b/tests/checkout/nasty.c
index 08e7628f5..952a6a112 100644
--- a/tests/checkout/nasty.c
+++ b/tests/checkout/nasty.c
@@ -217,12 +217,9 @@ 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)
+	if (!cl_sandbox_supports_8dot3())
 		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"));
diff --git a/tests/clar_libgit2.c b/tests/clar_libgit2.c
index a8a8ba6ab..6087c2a67 100644
--- a/tests/clar_libgit2.c
+++ b/tests/clar_libgit2.c
@@ -538,3 +538,25 @@ void cl_sandbox_set_search_path_defaults(void)
 		GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_SYSTEM, sandbox_path);
 }
 
+#ifdef GIT_WIN32
+bool cl_sandbox_supports_8dot3(void)
+{
+	git_buf longpath = GIT_BUF_INIT;
+	char *shortname;
+	bool supported;
+
+	cl_git_pass(
+		git_buf_joinpath(&longpath, clar_sandbox_path(), "longer_than_8dot3"));
+
+	cl_git_write2file(longpath.ptr, "", 0, O_RDWR|O_CREAT, 0666);
+	shortname = git_win32_path_8dot3_name(longpath.ptr);
+
+	supported = (shortname != NULL);
+
+	git__free(shortname);
+	git_buf_free(&longpath);
+
+	return supported;
+}
+#endif
+
diff --git a/tests/clar_libgit2.h b/tests/clar_libgit2.h
index e1d62c820..86c90b049 100644
--- a/tests/clar_libgit2.h
+++ b/tests/clar_libgit2.h
@@ -161,4 +161,8 @@ void cl_fake_home_cleanup(void *);
 
 void cl_sandbox_set_search_path_defaults(void);
 
+#ifdef GIT_WIN32
+bool cl_sandbox_supports_8dot3(void);
+#endif
+
 #endif
diff --git a/tests/path/win32.c b/tests/path/win32.c
index 41831a88c..4ff039738 100644
--- a/tests/path/win32.c
+++ b/tests/path/win32.c
@@ -194,13 +194,11 @@ void test_path_win32__8dot3_name(void)
 #ifdef GIT_WIN32
 	char *shortname;
 
-	/* Some guaranteed short names */
-	shortname = git_win32_path_8dot3_name("C:\\Program Files");
-
-	if (shortname == NULL)
+	if (!cl_sandbox_supports_8dot3())
 		clar__skip();
 
-	cl_assert_equal_s("PROGRA~1", shortname);
+	/* Some guaranteed short names */
+	cl_assert_equal_s("PROGRA~1", (shortname = git_win32_path_8dot3_name("C:\\Program Files")));
 	git__free(shortname);
 
 	cl_assert_equal_s("WINDOWS", (shortname = git_win32_path_8dot3_name("C:\\WINDOWS")));