Commit 79af4879 authored by Christoph Reiter's avatar Christoph Reiter 🐍

msvc: build the glib tests and ignore the test outcome

This makes the tests build under VS2015/2017.
Since some of them fail, similar to the mingw build, ignore any test errors for now.
parent ab116c31
......@@ -8,7 +8,8 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary
meson _build || goto :error
ninja -C _build || goto :error
meson test -C _build --timeout-multiplier %MESON_TEST_TIMEOUT_MULTIPLIER% || goto :error
:: FIXME: dont ignore test errors
meson test -C _build --timeout-multiplier %MESON_TEST_TIMEOUT_MULTIPLIER%
:: FIXME: can we get code coverage support?
......
......@@ -327,7 +327,4 @@ if enable_systemtap
install : true)
endif
# gtester doesn't work on native windows
if cc.get_id() != 'msvc'
subdir('tests')
endif
subdir('tests')
......@@ -17,6 +17,10 @@
#ifdef G_OS_WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
/* mingw defines it while msvc doesn't */
#ifndef SUBLANG_LITHUANIAN_LITHUANIA
#define SUBLANG_LITHUANIAN_LITHUANIA 0x01
#endif
#endif
static void
......
......@@ -36,11 +36,19 @@
#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <utime.h>
#endif
#include <fcntl.h>
#include <utime.h>
#ifdef G_OS_WIN32
#include <windows.h>
#include <sys/utime.h>
#include <io.h>
#ifndef S_ISDIR
#define S_ISDIR(m) (((m) & _S_IFMT) == _S_IFDIR)
#endif
#ifndef F_OK
#define F_OK 0
#endif
#endif
#define S G_DIR_SEPARATOR_S
......
  • Wondering if gstdio.h should define these, but that's for another MR anyway.

Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment