tor

commit 08bfc2d71a856feee0db5d230d31c5ad6b45d0c5
parent 5f9808d1d799c39f014ce3175779123aabc6058b
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 17 Dec 2019 15:02:06 -0500

Merge branch 'ticket32172_once_again'

Diffstat:
A
changes/ticket32172
 | 
4
++++
M
src/test/testing_common.c
 | 
11
+++++++++++

2 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/changes/ticket32172 b/changes/ticket32172
@@ -0,0 +1,4 @@
+  o Minor features (tests, Android):
+    - When running the unit tests on Android, create temporary files
+      in a subdirectory of /data/local/tmp. Closes ticket
+      32172. Based on a patch from Hans-Christoph Steiner.
diff --git a/src/test/testing_common.c b/src/test/testing_common.c
@@ -89,6 +89,17 @@ setup_directory(void)
                  (int)getpid(), rnd32);
     r = mkdir(temp_dir);
   }
+#elif defined(__ANDROID__)
+  /* tor might not like the default perms, so create a subdir */
+  tor_snprintf(temp_dir, sizeof(temp_dir),
+               "/data/local/tmp/tor_%d_%d_%s",
+               (int) getuid(), (int) getpid(), rnd32);
+  r = mkdir(temp_dir, 0700);
+  if (r) {
+    fprintf(stderr, "Can't create directory %s:", temp_dir);
+    perror("");
+    exit(1);
+  }
 #else /* !defined(_WIN32) */
   tor_snprintf(temp_dir, sizeof(temp_dir), "/tmp/tor_test_%d_%s",
                (int) getpid(), rnd32);