From 525de686a7f998ba3262241fa5554a00047c2eaa Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Wed, 27 Sep 2023 20:06:12 +0000 Subject: [PATCH] wasi: updates required for latest uvwasi version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Dawson PR-URL: https://github.com/nodejs/node/pull/49908 Reviewed-By: Tobias Nießen Reviewed-By: Colin Ihrig Reviewed-By: Luigi Pinca --- deps/uvwasi/uvwasi.gyp | 3 ++- test/wasi/c/sock.c | 4 ++-- test/wasi/wasm/sock.wasm | Bin 18999 -> 19026 bytes 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/deps/uvwasi/uvwasi.gyp b/deps/uvwasi/uvwasi.gyp index 5822f8d59bd9e9..525456a9a8b2cc 100644 --- a/deps/uvwasi/uvwasi.gyp +++ b/deps/uvwasi/uvwasi.gyp @@ -13,6 +13,7 @@ 'src/fd_table.c', 'src/path_resolver.c', 'src/poll_oneoff.c', + 'src/sync_helpers.c', 'src/uv_mapping.c', 'src/uvwasi.c', 'src/wasi_rights.c', @@ -36,4 +37,4 @@ ], } ] -} +} \ No newline at end of file diff --git a/test/wasi/c/sock.c b/test/wasi/c/sock.c index de4a3ccc5f95a6..d11e86c805784d 100644 --- a/test/wasi/c/sock.c +++ b/test/wasi/c/sock.c @@ -9,9 +9,9 @@ int main(void) { int fd = 0 ; socklen_t addrlen = 0; int flags = 0; - int ret = accept(0, NULL, &addrlen); + int ret = accept(10, NULL, &addrlen); assert(ret == -1); - assert(errno == ENOTSUP); + assert(errno == EBADF); return 0; } diff --git a/test/wasi/wasm/sock.wasm b/test/wasi/wasm/sock.wasm index 78e7b8e430f91141c4d2305da27a6dbc367f5437..9fdba111a23ca2298b62a449a5f8bce92fcc1f80 100755 GIT binary patch delta 2181 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