Merge branch 'msvc-glib-tests' into 'master'

msvc: build the glib tests and ignore the test outcome

See merge request GNOME/glib!22
This commit is contained in:
Xavier Claessens 2018-05-27 11:45:27 +00:00
commit ef4d960d2c
4 changed files with 16 additions and 6 deletions

View File

@ -8,7 +8,8 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary
meson _build || goto :error meson _build || goto :error
ninja -C _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? :: FIXME: can we get code coverage support?

View File

@ -327,7 +327,4 @@ if enable_systemtap
install : true) install : true)
endif endif
# gtester doesn't work on native windows subdir('tests')
if cc.get_id() != 'msvc'
subdir('tests')
endif

View File

@ -17,6 +17,10 @@
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
/* mingw defines it while msvc doesn't */
#ifndef SUBLANG_LITHUANIAN_LITHUANIA
#define SUBLANG_LITHUANIAN_LITHUANIA 0x01
#endif
#endif #endif
static void static void

View File

@ -36,11 +36,19 @@
#include <unistd.h> #include <unistd.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <utime.h>
#endif #endif
#include <fcntl.h> #include <fcntl.h>
#include <utime.h>
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
#include <windows.h> #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 #endif
#define S G_DIR_SEPARATOR_S #define S G_DIR_SEPARATOR_S