nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 20:33:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ticket27096'

Browse Source
This commit is contained in:
Nick Mathewson 2018-08-16 08:32:06 -04:00
commit d029a5162d
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug27096 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (testing):
- Fix two unit tests to work when HOME environment variable is not
set. Fixes bug 27096; bugfix on 0.2.8.1-alpha.

22
src/test/test_options.c
View File

@ -473,6 +473,13 @@ 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");
setup_capture_of_logs(LOG_WARN);
@ -512,6 +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
@ -1413,6 +1424,13 @@ test_options_validate__paths_needed(void *ignored)
(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(
"PathsNeededToBuildCircuits 0.1\n"
@ -1455,6 +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