summaryrefslogtreecommitdiff
path: root/deps/uv/test/test-fs-event.c
diff options
context:
space:
mode:
authorcjihrig <cjihrig@gmail.com>2020-03-11 12:36:48 -0400
committercjihrig <cjihrig@gmail.com>2020-03-14 11:44:25 -0400
commit907bcad8757534b2a3cfe9bf6b8325313f01050d (patch)
tree7736d92d9e677fd31a3ac93311012708753bf1e0 /deps/uv/test/test-fs-event.c
parentec204d86b06e4cc9259c1308e365a3e104212a16 (diff)
downloadnode-new-907bcad8757534b2a3cfe9bf6b8325313f01050d.tar.gz
deps: upgrade to libuv 1.35.0
Notable changes: - The UV_UDP_MMSG_CHUNK UDP flag has been added. - Support has been dropped for FreeBSD < 10. - The FreeBSD and Linux system call logic has been simplified to assume the presence of features covered by libuv's minimum system requirements. - Listening on IPC pipes is no longer allowed. - Fix iOS and Android builds. PR-URL: https://github.com/nodejs/node/pull/32204 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'deps/uv/test/test-fs-event.c')
-rw-r--r--deps/uv/test/test-fs-event.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/deps/uv/test/test-fs-event.c b/deps/uv/test/test-fs-event.c
index e694d258ea..28a6a1ebb3 100644
--- a/deps/uv/test/test-fs-event.c
+++ b/deps/uv/test/test-fs-event.c
@@ -285,6 +285,12 @@ static void fs_event_cb_dir_multi_file_in_subdir(uv_fs_event_t* handle,
if (filename && strcmp(filename, file_prefix_in_subdir) == 0)
return;
#endif
+ /* It may happen that the "subdir" creation event is captured even though
+ * we started watching after its actual creation.
+ */
+ if (strcmp(filename, "subdir") == 0)
+ return;
+
fs_multievent_cb_called++;
ASSERT(handle == &fs_event);
ASSERT(status == 0);
@@ -300,11 +306,13 @@ static void fs_event_cb_dir_multi_file_in_subdir(uv_fs_event_t* handle,
sizeof(file_prefix_in_subdir) - 1) == 0);
#endif
- if (fs_event_created + fs_event_removed == fs_event_file_count) {
+ if (fs_event_created == fs_event_file_count &&
+ fs_multievent_cb_called == fs_event_created) {
/* Once we've processed all create events, delete all files */
ASSERT(0 == uv_timer_start(&timer, fs_event_unlink_files_in_subdir, 1, 0));
} else if (fs_multievent_cb_called == 2 * fs_event_file_count) {
/* Once we've processed all create and delete events, stop watching */
+ ASSERT(fs_event_removed == fs_event_file_count);
uv_close((uv_handle_t*) &timer, close_cb);
uv_close((uv_handle_t*) handle, close_cb);
}