libuv 1.45.0, #include cleanup, probably something else.

git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@4308 ed5197a5-7fde-0310-b194-c3ffbd925b24

deps/libuv/test/test-fork.c

@@ -59,17 +59,18 @@ static void socket_cb(uv_poll_t* poll, int status, int events) {
 
 
 static void run_timer_loop_once(void) {
-  uv_loop_t* loop;
+  uv_loop_t loop;
   uv_timer_t timer_handle;
 
-  loop = uv_default_loop();
+  ASSERT_EQ(0, uv_loop_init(&loop));
 
   timer_cb_called = 0; /* Reset for the child. */
 
-  ASSERT(0 == uv_timer_init(loop, &timer_handle));
+  ASSERT(0 == uv_timer_init(&loop, &timer_handle));
   ASSERT(0 == uv_timer_start(&timer_handle, timer_cb, 1, 0));
-  ASSERT(0 == uv_run(loop, UV_RUN_DEFAULT));
+  ASSERT(0 == uv_run(&loop, UV_RUN_DEFAULT));
   ASSERT(1 == timer_cb_called);
+  ASSERT_EQ(0, uv_loop_close(&loop));
 }
 
 
@@ -111,7 +112,7 @@ TEST_IMPL(fork_timer) {
     run_timer_loop_once();
   }
 
-  MAKE_VALGRIND_HAPPY();
+  MAKE_VALGRIND_HAPPY(uv_default_loop());
   return 0;
 }
 
@@ -148,7 +149,7 @@ TEST_IMPL(fork_socketpair) {
     ASSERT(1 == socket_cb_called);
   }
 
-  MAKE_VALGRIND_HAPPY();
+  MAKE_VALGRIND_HAPPY(uv_default_loop());
   return 0;
 }
 
@@ -212,7 +213,7 @@ TEST_IMPL(fork_socketpair_started) {
     ASSERT(0 == strcmp("hi\n", socket_cb_read_buf));
   }
 
-  MAKE_VALGRIND_HAPPY();
+  MAKE_VALGRIND_HAPPY(uv_default_loop());
   return 0;
 }
 
@@ -269,7 +270,7 @@ TEST_IMPL(fork_signal_to_child) {
     ASSERT(SIGUSR1 == fork_signal_cb_called);
   }
 
-  MAKE_VALGRIND_HAPPY();
+  MAKE_VALGRIND_HAPPY(uv_default_loop());
   return 0;
 }
 
@@ -342,7 +343,7 @@ TEST_IMPL(fork_signal_to_child_closed) {
     exit(0);
   }
 
-  MAKE_VALGRIND_HAPPY();
+  MAKE_VALGRIND_HAPPY(uv_default_loop());
   return 0;
 }
 
@@ -500,7 +501,7 @@ static int _do_fork_fs_events_child(int file_or_dir) {
     printf("Exiting child \n");
   }
 
-  MAKE_VALGRIND_HAPPY();
+  MAKE_VALGRIND_HAPPY(uv_default_loop());
   return 0;
 
 }
@@ -597,7 +598,7 @@ TEST_IMPL(fork_fs_events_file_parent_child) {
   }
 
 
-  MAKE_VALGRIND_HAPPY();
+  MAKE_VALGRIND_HAPPY(loop);
   return 0;
 #endif
 }
@@ -646,6 +647,10 @@ TEST_IMPL(fork_threadpool_queue_work_simple) {
   pid_t child_pid;
   uv_loop_t loop;
 
+#ifdef __TSAN__
+  RETURN_SKIP("ThreadSanitizer doesn't support multi-threaded fork");
+#endif
+
   /* Prime the pool and default loop. */
   assert_run_work(uv_default_loop());
 
@@ -671,7 +676,7 @@ TEST_IMPL(fork_threadpool_queue_work_simple) {
   }
 
 
-  MAKE_VALGRIND_HAPPY();
+  MAKE_VALGRIND_HAPPY(uv_default_loop());
   return 0;
 }
 #endif /* !__MVS__ */