aboutsummaryrefslogtreecommitdiff
path: root/src/test/test_util.c
diff options
context:
space:
mode:
authorHans-Christoph Steiner <hans@eds.org>2019-10-16 18:52:36 +0200
committerNick Mathewson <nickm@torproject.org>2019-12-20 09:53:16 -0500
commita96317a79dac9d82c334e206c7c524e77f13217e (patch)
tree77112468be3cc38eb7ba72a6bbd438ee62191f1a /src/test/test_util.c
parent33a0f15b21811aac82de590d578921c70c758fbc (diff)
downloadtor-a96317a79dac9d82c334e206c7c524e77f13217e.tar.gz
tor-a96317a79dac9d82c334e206c7c524e77f13217e.zip
Android: skip tests that check UNIX user account setup
* there is no ~ or HOME in Android * UIDs and GIDs in Android represent apps, not users, and Android apps cannot ever change UIDs This should be replaced by whatever @nmathewson wants to name this stuff: https://github.com/torproject/tor/pull/1436
Diffstat (limited to 'src/test/test_util.c')
-rw-r--r--src/test/test_util.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/test/test_util.c b/src/test/test_util.c
index 7f7e157c17..ff0247fa08 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -5653,7 +5653,7 @@ test_util_touch_file(void *arg)
;
}
-#ifndef _WIN32
+#if !(defined(_WIN32) || defined (__ANDROID__))
static void
test_util_pwdb(void *arg)
{
@@ -5725,7 +5725,7 @@ test_util_pwdb(void *arg)
tor_free(dir);
teardown_capture_of_logs();
}
-#endif /* !defined(_WIN32) */
+#endif /* !(defined(_WIN32) || defined (__ANDROID__)) */
static void
test_util_calloc_check(void *arg)
@@ -6296,6 +6296,10 @@ test_util_map_anon_nofork(void *arg)
#define UTIL_TEST_NO_WIN(n, f) { #n, NULL, TT_SKIP, NULL, NULL }
#define UTIL_TEST_WIN_ONLY(n, f) UTIL_TEST(n, (f))
#define UTIL_LEGACY_NO_WIN(n) UTIL_TEST_NO_WIN(n, 0)
+#elif defined(__ANDROID__)
+#define UTIL_TEST_NO_WIN(n, f) { #n, NULL, TT_SKIP, NULL, NULL }
+#define UTIL_TEST_WIN_ONLY(n, f) { #n, NULL, TT_SKIP, NULL, NULL }
+#define UTIL_LEGACY_NO_WIN(n) UTIL_TEST_NO_WIN(n, 0)
#else
#define UTIL_TEST_NO_WIN(n, f) UTIL_TEST(n, (f))
#define UTIL_TEST_WIN_ONLY(n, f) { #n, NULL, TT_SKIP, NULL, NULL }