Commit b8a1ea7c by Russell Belfer

Fix core::env cleanup code

Mark fake home directories that failed to be created, so we won't
try to remove them and have cleanup just use p_rmdir.
parent 54254a0f
...@@ -46,8 +46,12 @@ void test_core_env__cleanup(void) ...@@ -46,8 +46,12 @@ void test_core_env__cleanup(void)
env_save[i] = NULL; env_save[i] = NULL;
} }
/* these will probably have already been cleaned up, but if a test
* fails, then it's probably good to try and clear out these dirs
*/
for (val = home_values; *val != NULL; val++) { for (val = home_values; *val != NULL; val++) {
cl_fixture_cleanup(*val); if (**val != '\0')
(void)p_rmdir(*val);
} }
} }
...@@ -79,8 +83,10 @@ void test_core_env__0(void) ...@@ -79,8 +83,10 @@ void test_core_env__0(void)
* we are on a filesystem that doesn't support the * we are on a filesystem that doesn't support the
* characters in question and skip this test... * characters in question and skip this test...
*/ */
if (p_mkdir(*val, 0777) != 0) if (p_mkdir(*val, 0777) != 0) {
*val = ""; /* mark as not created */
continue; continue;
}
cl_git_pass(git_path_prettify(&path, *val, NULL)); cl_git_pass(git_path_prettify(&path, *val, NULL));
...@@ -130,6 +136,8 @@ void test_core_env__0(void) ...@@ -130,6 +136,8 @@ void test_core_env__0(void)
} }
} }
#endif #endif
(void)p_rmdir(*val);
} }
git_buf_free(&path); git_buf_free(&path);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment