From 5a88a63b00499846026d07399b358e338b2046b4 Mon Sep 17 00:00:00 2001 From: David Carlier Date: Mon, 16 Dec 2019 15:29:48 +0100 Subject: [PATCH] test: fix test failure under NetBSD and OpenBSD MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For the dl api, OpenBSD reports only wrong binary format. Others are unsupported. PR-URL: https://github.com/libuv/libuv/pull/2572 Reviewed-By: Ben Noordhuis Reviewed-By: Colin Ihrig Reviewed-By: Santiago Gimeno Reviewed-By: Saúl Ibarra Corretgé --- test/test-dlerror.c | 4 ++++ test/test-fs.c | 3 ++- test/test-udp-multicast-join.c | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/test/test-dlerror.c b/test/test-dlerror.c index 8f7697b5..70cc9bfa 100644 --- a/test/test-dlerror.c +++ b/test/test-dlerror.c @@ -42,13 +42,17 @@ TEST_IMPL(dlerror) { msg = uv_dlerror(&lib); ASSERT(msg != NULL); +#ifndef __OpenBSD__ ASSERT(strstr(msg, path) != NULL); +#endif ASSERT(strstr(msg, dlerror_no_error) == NULL); /* Should return the same error twice in a row. */ msg = uv_dlerror(&lib); ASSERT(msg != NULL); +#ifndef __OpenBSD__ ASSERT(strstr(msg, path) != NULL); +#endif ASSERT(strstr(msg, dlerror_no_error) == NULL); uv_dlclose(&lib); diff --git a/test/test-fs.c b/test/test-fs.c index ded1eec8..4b5051df 100644 --- a/test/test-fs.c +++ b/test/test-fs.c @@ -343,7 +343,8 @@ static void statfs_cb(uv_fs_t* req) { ASSERT(req->ptr != NULL); stats = req->ptr; -#if defined(_WIN32) || defined(__sun) || defined(_AIX) || defined(__MVS__) +#if defined(_WIN32) || defined(__sun) || defined(_AIX) || defined(__MVS__) || \ + defined(__OpenBSD__) || defined(__NetBSD__) ASSERT(stats->f_type == 0); #else ASSERT(stats->f_type > 0); diff --git a/test/test-udp-multicast-join.c b/test/test-udp-multicast-join.c index 6bac072d..cb3ff871 100644 --- a/test/test-udp-multicast-join.c +++ b/test/test-udp-multicast-join.c @@ -126,8 +126,10 @@ static void cl_recv_cb(uv_udp_t* handle, r = uv_udp_set_membership(&server, MULTICAST_ADDR, NULL, UV_LEAVE_GROUP); ASSERT(r == 0); +#if !defined(__OpenBSD__) && !defined(__NetBSD__) r = uv_udp_set_source_membership(&server, MULTICAST_ADDR, NULL, source_addr, UV_JOIN_GROUP); ASSERT(r == 0); +#endif r = do_send(&req_ss); ASSERT(r == 0);