commit 7dbcdfab584abfa3a2e85ff0e82a1ff76d114287 Author: Nick Mathewson nickm@torproject.org Date: Thu Oct 22 10:01:05 2015 -0400

Fix windows build: do not assume util_process works on windows --- src/test/test_util_process.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/test/test_util_process.c b/src/test/test_util_process.c index 04a21b8..876a625 100644 --- a/src/test/test_util_process.c +++ b/src/test/test_util_process.c @@ -11,6 +11,7 @@

#include "log_test_helpers.h"

+#ifndef _WIN32 #define NS_MODULE util_process

static void @@ -67,12 +68,17 @@ test_util_process_clear_waitpid_callback(void *ignored) done: teardown_capture_of_logs(previous_log); } +#endif /* _WIN32 */ + +#ifdef _WIN32 +#define TEST(name) { #name, test_util_process_##name, 0, NULL, NULL } +#else +#define TEST(name) { #name, NULL, TT_SKIP, NULL, NULL } +#endif

struct testcase_t util_process_tests[] = { - { "set_waitpid_callback", test_util_process_set_waitpid_callback, 0, - NULL, NULL }, - { "clear_waitpid_callback", test_util_process_clear_waitpid_callback, 0, - NULL, NULL }, + TEST(set_waitpid_callback), + TEST(clear_waitpid_callback), END_OF_TESTCASES };