[tor-commits] [tor/master] Disable load_geoip_file() tests on windows

nickm at torproject.org nickm at torproject.org
Fri Apr 13 14:42:25 UTC 2018


commit ad57b1279ab68e204243ddf3cf841fd85606c331
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 12 12:45:12 2018 -0400

    Disable load_geoip_file() tests on windows
    
    See bug #25787 for discussion; we should have a better fix here.
---
 src/test/test_geoip.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/test/test_geoip.c b/src/test/test_geoip.c
index be1376a3b..20f6114dc 100644
--- a/src/test/test_geoip.c
+++ b/src/test/test_geoip.c
@@ -449,10 +449,16 @@ test_geoip_load_file(void *arg)
 #define FORK(name)                                                      \
   { #name, test_ ## name , TT_FORK, NULL, NULL }
 
+#ifdef _WIN32
+#define SKIP_ON_WINDOWS TT_SKIP
+#else
+#define SKIP_ON_WINDOWS 0
+#endif
+
 struct testcase_t geoip_tests[] = {
   { "geoip", test_geoip, TT_FORK, NULL, NULL },
   { "geoip_with_pt", test_geoip_with_pt, TT_FORK, NULL, NULL },
-  { "load_file", test_geoip_load_file, TT_FORK, NULL, NULL },
+  { "load_file", test_geoip_load_file, TT_FORK|SKIP_ON_WINDOWS, NULL, NULL },
 
   END_OF_TESTCASES
 };



More information about the tor-commits mailing list