mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 22:58:50 +01:00
Code Issues Projects Releases Wiki Activity

Rename UTIL_TEST_NO_WIN to reflect intent

Browse source 
Now that these tests are skipped on windows _and_ android, we should
name the macro that skips them after the functionality that the
tests depend on.

Closes last part of 32825.
This commit is contained in:
Nick Mathewson 2019-12-20 10:04:56 -05:00
parent 5c6fc5250e
commit ac7d6f3c05
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/test/test_util.c
View file

@ -72,6 +72,11 @@
#include <ctype.h> #include <ctype.h>
#include <float.h> #include <float.h>
/* These platforms don't have meaningful pwdb or homedirs. */
#if defined(_WIN32) || defined(__ANDROID__)
#define DISABLE_PWDB_TESTS
#endif
#define INFINITY_DBL ((double)INFINITY) #define INFINITY_DBL ((double)INFINITY)
#define NAN_DBL ((double)NAN) #define NAN_DBL ((double)NAN)
@ -1845,7 +1850,7 @@ test_util_config_line_crlf(void *arg)
tor_free(k); tor_free(v); tor_free(k); tor_free(v);
} }
#ifndef _WIN32 #ifndef DISABLE_PWDB_TESTS
static void static void
test_util_expand_filename(void *arg) test_util_expand_filename(void *arg)
{ {
@ -5653,7 +5658,7 @@ test_util_touch_file(void *arg)
; ;
} }
#if !(defined(_WIN32) || defined (__ANDROID__)) #ifndef DISABLE_PWDB_TESTS
static void static void
test_util_pwdb(void *arg) test_util_pwdb(void *arg)
{ {
@ -6293,15 +6298,16 @@ test_util_map_anon_nofork(void *arg)
#endif /* !defined(COCCI) */ #endif /* !defined(COCCI) */
#ifdef _WIN32 #ifdef _WIN32
#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_TEST_WIN_ONLY(n, f) UTIL_TEST(n, (f))
#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 }
#else #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 } #define UTIL_TEST_WIN_ONLY(n, f) { #n, NULL, TT_SKIP, NULL, NULL }
#endif /* defined(_WIN32) */ #endif
#ifdef DISABLE_PWDB_TESTS
#define UTIL_TEST_PWDB(n, f) { #n, NULL, TT_SKIP, NULL, NULL }
#else
#define UTIL_TEST_PWDB(n, f) UTIL_TEST(n, (f))
#endif
struct testcase_t util_tests[] = { struct testcase_t util_tests[] = {
UTIL_LEGACY(time), UTIL_LEGACY(time),
@ -6311,7 +6317,7 @@ struct testcase_t util_tests[] = {
UTIL_LEGACY(config_line_comment_character), UTIL_LEGACY(config_line_comment_character),
UTIL_LEGACY(config_line_escaped_content), UTIL_LEGACY(config_line_escaped_content),
UTIL_LEGACY(config_line_crlf), UTIL_LEGACY(config_line_crlf),
UTIL_TEST_NO_WIN(expand_filename, 0), UTIL_TEST_PWDB(expand_filename, 0),
UTIL_LEGACY(escape_string_socks), UTIL_LEGACY(escape_string_socks),
UTIL_LEGACY(string_is_key_value), UTIL_LEGACY(string_is_key_value),
UTIL_LEGACY(strmisc), UTIL_LEGACY(strmisc),
@ -6396,7 +6402,7 @@ struct testcase_t util_tests[] = {
UTIL_TEST(writepid, 0), UTIL_TEST(writepid, 0),
UTIL_TEST(get_avail_disk_space, 0), UTIL_TEST(get_avail_disk_space, 0),
UTIL_TEST(touch_file, 0), UTIL_TEST(touch_file, 0),
UTIL_TEST_NO_WIN(pwdb, TT_FORK), UTIL_TEST_PWDB(pwdb, TT_FORK),
UTIL_TEST(calloc_check, 0), UTIL_TEST(calloc_check, 0),
UTIL_TEST(monotonic_time, 0), UTIL_TEST(monotonic_time, 0),
UTIL_TEST(monotonic_time_ratchet, TT_FORK), UTIL_TEST(monotonic_time_ratchet, TT_FORK),