[tor-commits] [tor/master] Exclude setenv/unsetenv code on Windows
nickm at torproject.org
nickm at torproject.org
Thu Aug 16 12:33:46 UTC 2018
commit fb137b30fc69bb9fa4b417cfe47a8191ecf0a70c
Author: rl1987 <rl1987 at sdf.lonestar.org>
Date: Sun Aug 12 15:28:34 2018 +0300
Exclude setenv/unsetenv code on Windows
---
src/test/test_options.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/test/test_options.c b/src/test/test_options.c
index dcb8932be..801b5895f 100644
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -474,9 +474,11 @@ test_options_validate__uname_for_server(void *ignored)
(void)ignored;
char *msg;
+#ifndef _WIN32
int unset_home_env = 0;
if (setenv("HOME", "/home/john", 0) == 0)
unset_home_env = 1;
+#endif
options_test_data_t *tdata = get_options_test_data(
"ORPort 127.0.0.1:5555");
@@ -517,8 +519,10 @@ test_options_validate__uname_for_server(void *ignored)
free_options_test_data(tdata);
tor_free(msg);
teardown_capture_of_logs();
+#ifndef _WIN32
if (unset_home_env)
unsetenv("HOME");
+#endif
}
static void
@@ -1421,9 +1425,11 @@ test_options_validate__paths_needed(void *ignored)
int ret;
char *msg;
+#ifndef _WIN32
int unset_home_env = 0;
if (setenv("HOME", "/home/john", 0) == 0)
unset_home_env = 1;
+#endif
setup_capture_of_logs(LOG_WARN);
options_test_data_t *tdata = get_options_test_data(
@@ -1467,8 +1473,10 @@ test_options_validate__paths_needed(void *ignored)
teardown_capture_of_logs();
free_options_test_data(tdata);
tor_free(msg);
+#ifndef _WIN32
if (unset_home_env)
unsetenv("HOME");
+#endif
}
static void
More information about the tor-commits
mailing list