diff options
author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2023-02-13 18:00:52 +0400 |
---|---|---|
committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2023-02-13 18:04:38 +0400 |
commit | 40d13a7b403faa5dd4c0fd957b2d9bd31756731b (patch) | |
tree | 1c3deeee4916ab8fc0f36dfc0c45696ef6516a44 /tests | |
parent | deb323c34a60b071fb97c2a7420a5159a7472316 (diff) |
tests: fix win32 compilation
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Part-of: <https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/1030>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/test_fuzzer_formats.c | 15 | ||||
-rw-r--r-- | tests/test_virgl_cmd.c | 2 | ||||
-rw-r--r-- | tests/test_virgl_fence.c | 6 | ||||
-rw-r--r-- | tests/test_virgl_init.c | 8 | ||||
-rw-r--r-- | tests/test_virgl_transfer.c | 2 | ||||
-rw-r--r-- | tests/testvirgl.c | 4 |
6 files changed, 32 insertions, 5 deletions
diff --git a/tests/test_fuzzer_formats.c b/tests/test_fuzzer_formats.c index 7e41834..727cd93 100644 --- a/tests/test_fuzzer_formats.c +++ b/tests/test_fuzzer_formats.c @@ -29,13 +29,13 @@ #include <stdint.h> #include <stddef.h> -#include <sys/uio.h> #include <assert.h> #include <unistd.h> #include <stdlib.h> #include <string.h> #include "virgl_hw.h" +#include "vrend_iov.h" #include "vrend_winsys_egl.h" #include "virglrenderer.h" #include "virgl_protocol.h" @@ -84,6 +84,19 @@ static struct virgl_renderer_callbacks fuzzer_cbs = { .make_current = fuzzer_make_current, }; +#ifdef _WIN32 +static int setenv(const char *name, const char *value, int overwrite) +{ + int errcode = 0; + if(!overwrite) { + size_t envsize = 0; + errcode = getenv_s(&envsize, NULL, 0, name); + if(errcode || envsize) return errcode; + } + return _putenv_s(name, value); +} +#endif + static void initialize_environment() { setenv("LIBGL_ALWAYS_SOFTWARE", "true", 0); diff --git a/tests/test_virgl_cmd.c b/tests/test_virgl_cmd.c index 4c8d689..961f229 100644 --- a/tests/test_virgl_cmd.c +++ b/tests/test_virgl_cmd.c @@ -25,9 +25,9 @@ #include <stdlib.h> #include <time.h> #include <errno.h> -#include <sys/uio.h> #include <virglrenderer.h> #include "virgl_hw.h" +#include "vrend_iov.h" #include "pipe/p_format.h" #include "testvirgl_encode.h" #include "virgl_protocol.h" diff --git a/tests/test_virgl_fence.c b/tests/test_virgl_fence.c index 9e498ce..a09169a 100644 --- a/tests/test_virgl_fence.c +++ b/tests/test_virgl_fence.c @@ -29,7 +29,9 @@ #include <check.h> #include <errno.h> +#ifndef _WIN32 #include <poll.h> +#endif #include <stdlib.h> #include <unistd.h> #include <virglrenderer.h> @@ -118,6 +120,7 @@ START_TEST(virgl_fence_poll_many) } END_TEST +#ifndef _WIN32 static int wait_sync_fd(int fd, int timeout) { @@ -237,6 +240,7 @@ START_TEST(virgl_fence_export_invalid) testvirgl_fini_single_ctx(); } END_TEST +#endif static Suite *virgl_init_suite(bool include_fence_export) { @@ -251,9 +255,11 @@ static Suite *virgl_init_suite(bool include_fence_export) tcase_add_test(tc_core, virgl_fence_poll_many); if (include_fence_export) { +#ifndef _WIN32 tcase_add_test(tc_core, virgl_fence_export); tcase_add_test(tc_core, virgl_fence_export_signaled); tcase_add_test(tc_core, virgl_fence_export_invalid); +#endif } suite_add_tcase(s, tc_core); diff --git a/tests/test_virgl_init.c b/tests/test_virgl_init.c index a019ae4..104e86d 100644 --- a/tests/test_virgl_init.c +++ b/tests/test_virgl_init.c @@ -27,14 +27,18 @@ * and context creation tests. */ +#include "config.h" + #include <check.h> #include <stdlib.h> #include <errno.h> #include <virglrenderer.h> +#ifdef ENABLE_GBM #include <gbm.h> -#include <sys/uio.h> +#endif #include "testvirgl.h" #include "virgl_hw.h" +#include "vrend_iov.h" struct myinfo_struct { uint32_t test; }; @@ -378,10 +382,12 @@ START_TEST(virgl_test_get_resource_info) ret = virgl_renderer_resource_get_info(res.handle, &info); ck_assert_int_eq(ret, 0); +#ifdef ENABLE_GBM ck_assert(info.drm_fourcc == GBM_FORMAT_ABGR8888 || info.drm_fourcc == GBM_FORMAT_XBGR8888 || info.drm_fourcc == GBM_FORMAT_ARGB8888 || info.drm_fourcc == GBM_FORMAT_XRGB8888); +#endif ck_assert_int_eq(info.virgl_format, res.format); ck_assert_int_eq(res.width, info.width); ck_assert_int_eq(res.height, info.height); diff --git a/tests/test_virgl_transfer.c b/tests/test_virgl_transfer.c index 1e37883..acc5c3a 100644 --- a/tests/test_virgl_transfer.c +++ b/tests/test_virgl_transfer.c @@ -25,11 +25,11 @@ /* transfer and iov related tests */ #include <check.h> #include <stdlib.h> -#include <sys/uio.h> #include <errno.h> #include <virglrenderer.h> #include "pipe/p_defines.h" #include "virgl_hw.h" +#include "vrend_iov.h" #include "virgl_protocol.h" #include "testvirgl_encode.h" diff --git a/tests/testvirgl.c b/tests/testvirgl.c index 965c88b..1760962 100644 --- a/tests/testvirgl.c +++ b/tests/testvirgl.c @@ -23,9 +23,10 @@ **************************************************************************/ /* helper functions for testing purposes */ +#include "config.h" + #include <check.h> #include <errno.h> -#include <sys/uio.h> #include "pipe/p_defines.h" #include "pipe/p_format.h" #include "util/u_memory.h" @@ -33,6 +34,7 @@ #include "testvirgl.h" #include "virgl_hw.h" +#include "vrend_iov.h" #include "virglrenderer.h" int context_flags = VIRGL_RENDERER_USE_EGL; |