|
@@ -196,9 +196,9 @@ static void
|
|
|
test_config_check_or_create_data_subdir(void *arg)
|
|
|
{
|
|
|
or_options_t *options = get_options_mutable();
|
|
|
- char *datadir = options->DataDirectory = tor_strdup(get_fname("datadir-0"));
|
|
|
+ char *datadir;
|
|
|
const char *subdir = "test_stats";
|
|
|
- char *subpath = get_datadir_fname(subdir);
|
|
|
+ char *subpath;
|
|
|
struct stat st;
|
|
|
int r;
|
|
|
#if !defined (_WIN32) || defined (WINCE)
|
|
@@ -206,6 +206,10 @@ test_config_check_or_create_data_subdir(void *arg)
|
|
|
#endif
|
|
|
(void)arg;
|
|
|
|
|
|
+ tor_free(options->DataDirectory);
|
|
|
+ datadir = options->DataDirectory = tor_strdup(get_fname("datadir-0"));
|
|
|
+ subpath = get_datadir_fname(subdir);
|
|
|
+
|
|
|
#if defined (_WIN32) && !defined (WINCE)
|
|
|
tt_int_op(mkdir(options->DataDirectory), ==, 0);
|
|
|
#else
|
|
@@ -254,7 +258,7 @@ static void
|
|
|
test_config_write_to_data_subdir(void *arg)
|
|
|
{
|
|
|
or_options_t* options = get_options_mutable();
|
|
|
- char *datadir = options->DataDirectory = tor_strdup(get_fname("datadir-1"));
|
|
|
+ char *datadir;
|
|
|
char *cp = NULL;
|
|
|
const char* subdir = "test_stats";
|
|
|
const char* fname = "test_file";
|
|
@@ -276,6 +280,9 @@ test_config_write_to_data_subdir(void *arg)
|
|
|
char* filepath = get_datadir_fname2(subdir, fname);
|
|
|
(void)arg;
|
|
|
|
|
|
+ tor_free(options->DataDirectory);
|
|
|
+ datadir = options->DataDirectory = tor_strdup(get_fname("datadir-1"));
|
|
|
+
|
|
|
#if defined (_WIN32) && !defined (WINCE)
|
|
|
tt_int_op(mkdir(options->DataDirectory), ==, 0);
|
|
|
#else
|