diff options
| -rw-r--r-- | tests/t15-config.c | 9 | ||||
| -rw-r--r-- | tests/t16-remotes.c | 17 |
2 files changed, 14 insertions, 12 deletions
diff --git a/tests/t15-config.c b/tests/t15-config.c index fdfa092ef..d912abb8e 100644 --- a/tests/t15-config.c +++ b/tests/t15-config.c @@ -26,6 +26,7 @@ #include "test_helpers.h" #include <git2.h> +#include <posix.h> #include "filebuf.h" #define CONFIG_BASE TEST_RESOURCES "/config" @@ -217,7 +218,7 @@ BEGIN_TEST(config10, "a repo's config overrides the global config") char *old_home; old_home = git__strdup(getenv("HOME")); - setenv("HOME", CONFIG_BASE, 1); + p_setenv("HOME", CONFIG_BASE, 1); must_pass(git_repository_open(&repo, REPOSITORY_FOLDER)); must_pass(git_repository_config(&cfg, repo, NULL)); @@ -226,7 +227,7 @@ BEGIN_TEST(config10, "a repo's config overrides the global config") git_config_free(cfg); git_repository_free(repo); - setenv("HOME", old_home, 1); + p_setenv("HOME", old_home, 1); free(old_home); END_TEST @@ -237,7 +238,7 @@ BEGIN_TEST(config11, "fall back to the global config") char *old_home; old_home = git__strdup(getenv("HOME")); - setenv("HOME", CONFIG_BASE, 1); + p_setenv("HOME", CONFIG_BASE, 1); must_pass(git_repository_open(&repo, REPOSITORY_FOLDER)); must_pass(git_repository_config(&cfg, repo, NULL)); @@ -246,7 +247,7 @@ BEGIN_TEST(config11, "fall back to the global config") git_config_free(cfg); git_repository_free(repo); - setenv("HOME", old_home, 1); + p_setenv("HOME", old_home, 1); free(old_home); END_TEST diff --git a/tests/t16-remotes.c b/tests/t16-remotes.c index 6529f0ec4..af54f297d 100644 --- a/tests/t16-remotes.c +++ b/tests/t16-remotes.c @@ -26,6 +26,7 @@ #include "test_helpers.h" #include <git2.h> +#include <posix.h> BEGIN_TEST(remotes0, "remote parsing works") git_remote *remote; @@ -34,7 +35,7 @@ BEGIN_TEST(remotes0, "remote parsing works") char *old_home; old_home = git__strdup(getenv("HOME")); - setenv("HOME", "/dev/null", 1); + p_setenv("HOME", "/dev/null", 1); must_pass(git_repository_open(&repo, REPOSITORY_FOLDER)); must_pass(git_repository_config(&cfg, repo, NULL)); @@ -46,7 +47,7 @@ BEGIN_TEST(remotes0, "remote parsing works") git_config_free(cfg); git_repository_free(repo); - setenv("HOME", old_home, 1); + p_setenv("HOME", old_home, 1); free(old_home); END_TEST @@ -58,7 +59,7 @@ BEGIN_TEST(refspec0, "remote with refspec works") char *old_home; old_home = git__strdup(getenv("HOME")); - setenv("HOME", "/dev/null", 1); + p_setenv("HOME", "/dev/null", 1); must_pass(git_repository_open(&repo, REPOSITORY_FOLDER)); must_pass(git_repository_config(&cfg, repo, NULL)); @@ -71,7 +72,7 @@ BEGIN_TEST(refspec0, "remote with refspec works") git_config_free(cfg); git_repository_free(repo); - setenv("HOME", old_home, 1); + p_setenv("HOME", old_home, 1); free(old_home); END_TEST @@ -83,7 +84,7 @@ BEGIN_TEST(refspec1, "remote fnmatch works as expected") char *old_home; old_home = git__strdup(getenv("HOME")); - setenv("HOME", "/dev/null", 1); + p_setenv("HOME", "/dev/null", 1); must_pass(git_repository_open(&repo, REPOSITORY_FOLDER)); must_pass(git_repository_config(&cfg, repo, NULL)); @@ -96,7 +97,7 @@ BEGIN_TEST(refspec1, "remote fnmatch works as expected") git_config_free(cfg); git_repository_free(repo); - setenv("HOME", old_home, 1); + p_setenv("HOME", old_home, 1); free(old_home); END_TEST @@ -109,7 +110,7 @@ BEGIN_TEST(refspec2, "refspec transform") char *old_home; old_home = git__strdup(getenv("HOME")); - setenv("HOME", "/dev/null", 1); + p_setenv("HOME", "/dev/null", 1); must_pass(git_repository_open(&repo, REPOSITORY_FOLDER)); must_pass(git_repository_config(&cfg, repo, NULL)); @@ -122,7 +123,7 @@ BEGIN_TEST(refspec2, "refspec transform") git_config_free(cfg); git_repository_free(repo); - setenv("HOME", old_home, 1); + p_setenv("HOME", old_home, 1); free(old_home); END_TEST |