summaryrefslogtreecommitdiff
path: root/deps/uv/test
diff options
context:
space:
mode:
authorcjihrig <cjihrig@gmail.com>2017-01-09 17:10:37 -0500
committercjihrig <cjihrig@gmail.com>2017-01-12 10:26:43 -0500
commit74fb8a29485e47a9a37d357a1c8a149b414bef9f (patch)
tree46dbe42071fa227653ab0b240ed259b800deba51 /deps/uv/test
parentd3eca025763584462203d53d92a9eda2278c7810 (diff)
downloadandroid-node-v8-74fb8a29485e47a9a37d357a1c8a149b414bef9f.tar.gz
android-node-v8-74fb8a29485e47a9a37d357a1c8a149b414bef9f.tar.bz2
android-node-v8-74fb8a29485e47a9a37d357a1c8a149b414bef9f.zip
deps: upgrade libuv to 1.10.2
Refs: https://github.com/nodejs/node/issues/9439 Fixes: https://github.com/nodejs/node/issues/9464 Fixes: https://github.com/nodejs/node/issues/9690 PR-URL: https://github.com/nodejs/node/pull/10717 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com> Reviewed-By: Saúl Ibarra Corretgé <saghul@gmail.com>
Diffstat (limited to 'deps/uv/test')
-rw-r--r--deps/uv/test/test-error.c1
-rw-r--r--deps/uv/test/test-fs.c20
-rw-r--r--deps/uv/test/test-getaddrinfo.c7
-rw-r--r--deps/uv/test/test-list.h4
-rw-r--r--deps/uv/test/test-tty.c87
5 files changed, 110 insertions, 9 deletions
diff --git a/deps/uv/test/test-error.c b/deps/uv/test/test-error.c
index 4c4efa30cd..ff53eb1d77 100644
--- a/deps/uv/test/test-error.c
+++ b/deps/uv/test/test-error.c
@@ -53,6 +53,7 @@ TEST_IMPL(error_message) {
TEST_IMPL(sys_error) {
#if defined(_WIN32)
ASSERT(uv_translate_sys_error(ERROR_NOACCESS) == UV_EACCES);
+ ASSERT(uv_translate_sys_error(ERROR_ELEVATION_REQUIRED) == UV_EACCES);
ASSERT(uv_translate_sys_error(WSAEADDRINUSE) == UV_EADDRINUSE);
ASSERT(uv_translate_sys_error(ERROR_BAD_PIPE) == UV_EPIPE);
#else
diff --git a/deps/uv/test/test-fs.c b/deps/uv/test/test-fs.c
index 06718f285e..70a2399962 100644
--- a/deps/uv/test/test-fs.c
+++ b/deps/uv/test/test-fs.c
@@ -1141,11 +1141,15 @@ TEST_IMPL(fs_fstat) {
ASSERT(s->st_mtim.tv_nsec == t.st_mtimensec);
ASSERT(s->st_ctim.tv_sec == t.st_ctime);
ASSERT(s->st_ctim.tv_nsec == t.st_ctimensec);
-#elif defined(__sun) || \
- defined(_GNU_SOURCE) || \
- defined(_BSD_SOURCE) || \
- defined(_SVID_SOURCE) || \
- defined(_XOPEN_SOURCE) || \
+#elif defined(__sun) || \
+ defined(__DragonFly__) || \
+ defined(__FreeBSD__) || \
+ defined(__OpenBSD__) || \
+ defined(__NetBSD__) || \
+ defined(_GNU_SOURCE) || \
+ defined(_BSD_SOURCE) || \
+ defined(_SVID_SOURCE) || \
+ defined(_XOPEN_SOURCE) || \
defined(_DEFAULT_SOURCE)
ASSERT(s->st_atim.tv_sec == t.st_atim.tv_sec);
ASSERT(s->st_atim.tv_nsec == t.st_atim.tv_nsec);
@@ -1153,10 +1157,8 @@ TEST_IMPL(fs_fstat) {
ASSERT(s->st_mtim.tv_nsec == t.st_mtim.tv_nsec);
ASSERT(s->st_ctim.tv_sec == t.st_ctim.tv_sec);
ASSERT(s->st_ctim.tv_nsec == t.st_ctim.tv_nsec);
-# if defined(__DragonFly__) || \
- defined(__FreeBSD__) || \
- defined(__OpenBSD__) || \
- defined(__NetBSD__)
+# if defined(__FreeBSD__) || \
+ defined(__NetBSD__)
ASSERT(s->st_birthtim.tv_sec == t.st_birthtim.tv_sec);
ASSERT(s->st_birthtim.tv_nsec == t.st_birthtim.tv_nsec);
ASSERT(s->st_flags == t.st_flags);
diff --git a/deps/uv/test/test-getaddrinfo.c b/deps/uv/test/test-getaddrinfo.c
index 6b644a8d44..03dc126956 100644
--- a/deps/uv/test/test-getaddrinfo.c
+++ b/deps/uv/test/test-getaddrinfo.c
@@ -83,6 +83,13 @@ static void getaddrinfo_cuncurrent_cb(uv_getaddrinfo_t* handle,
TEST_IMPL(getaddrinfo_fail) {
uv_getaddrinfo_t req;
+ ASSERT(UV_EINVAL == uv_getaddrinfo(uv_default_loop(),
+ &req,
+ (uv_getaddrinfo_cb) abort,
+ NULL,
+ NULL,
+ NULL));
+
/* Use a FQDN by ending in a period */
ASSERT(0 == uv_getaddrinfo(uv_default_loop(),
&req,
diff --git a/deps/uv/test/test-list.h b/deps/uv/test/test-list.h
index 08886a6f4a..be3f9069cc 100644
--- a/deps/uv/test/test-list.h
+++ b/deps/uv/test/test-list.h
@@ -47,6 +47,8 @@ TEST_DECLARE (semaphore_3)
TEST_DECLARE (tty)
#ifdef _WIN32
TEST_DECLARE (tty_raw)
+TEST_DECLARE (tty_empty_write)
+TEST_DECLARE (tty_large_write)
#endif
TEST_DECLARE (tty_file)
TEST_DECLARE (tty_pty)
@@ -404,6 +406,8 @@ TASK_LIST_START
TEST_ENTRY (tty)
#ifdef _WIN32
TEST_ENTRY (tty_raw)
+ TEST_ENTRY (tty_empty_write)
+ TEST_ENTRY (tty_large_write)
#endif
TEST_ENTRY (tty_file)
TEST_ENTRY (tty_pty)
diff --git a/deps/uv/test/test-tty.c b/deps/uv/test/test-tty.c
index d03f07a441..d1f7deb231 100644
--- a/deps/uv/test/test-tty.c
+++ b/deps/uv/test/test-tty.c
@@ -212,6 +212,93 @@ TEST_IMPL(tty_raw) {
MAKE_VALGRIND_HAPPY();
return 0;
}
+
+TEST_IMPL(tty_empty_write) {
+ int r;
+ int ttyout_fd;
+ uv_tty_t tty_out;
+ char dummy[1];
+ uv_buf_t bufs[1];
+ uv_loop_t* loop;
+
+ /* Make sure we have an FD that refers to a tty */
+ HANDLE handle;
+
+ loop = uv_default_loop();
+
+ handle = CreateFileA("conout$",
+ GENERIC_READ | GENERIC_WRITE,
+ FILE_SHARE_READ | FILE_SHARE_WRITE,
+ NULL,
+ OPEN_EXISTING,
+ FILE_ATTRIBUTE_NORMAL,
+ NULL);
+ ASSERT(handle != INVALID_HANDLE_VALUE);
+ ttyout_fd = _open_osfhandle((intptr_t) handle, 0);
+
+ ASSERT(ttyout_fd >= 0);
+
+ ASSERT(UV_TTY == uv_guess_handle(ttyout_fd));
+
+ r = uv_tty_init(uv_default_loop(), &tty_out, ttyout_fd, 0); /* Writable. */
+ ASSERT(r == 0);
+
+ bufs[0].len = 0;
+ bufs[0].base = &dummy;
+
+ r = uv_try_write((uv_stream_t*) &tty_out, bufs, 1);
+ ASSERT(r == 0);
+
+ uv_close((uv_handle_t*) &tty_out, NULL);
+
+ uv_run(loop, UV_RUN_DEFAULT);
+
+ MAKE_VALGRIND_HAPPY();
+ return 0;
+}
+
+TEST_IMPL(tty_large_write) {
+ int r;
+ int ttyout_fd;
+ uv_tty_t tty_out;
+ char dummy[10000];
+ uv_buf_t bufs[1];
+ uv_loop_t* loop;
+
+ /* Make sure we have an FD that refers to a tty */
+ HANDLE handle;
+
+ loop = uv_default_loop();
+
+ handle = CreateFileA("conout$",
+ GENERIC_READ | GENERIC_WRITE,
+ FILE_SHARE_READ | FILE_SHARE_WRITE,
+ NULL,
+ OPEN_EXISTING,
+ FILE_ATTRIBUTE_NORMAL,
+ NULL);
+ ASSERT(handle != INVALID_HANDLE_VALUE);
+ ttyout_fd = _open_osfhandle((intptr_t) handle, 0);
+
+ ASSERT(ttyout_fd >= 0);
+
+ ASSERT(UV_TTY == uv_guess_handle(ttyout_fd));
+
+ r = uv_tty_init(uv_default_loop(), &tty_out, ttyout_fd, 0); /* Writable. */
+ ASSERT(r == 0);
+
+ bufs[0] = uv_buf_init(dummy, sizeof(dummy));
+
+ r = uv_try_write((uv_stream_t*) &tty_out, bufs, 1);
+ ASSERT(r == 10000);
+
+ uv_close((uv_handle_t*) &tty_out, NULL);
+
+ uv_run(loop, UV_RUN_DEFAULT);
+
+ MAKE_VALGRIND_HAPPY();
+ return 0;
+}
#endif