diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-06 19:19:47 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-06 19:21:55 +0300 |
commit | 2dba2b3d71d9781bce452c78a4f2c686169418b4 (patch) | |
tree | 34d33cffc5fb045f21ed2fec3d2fd74b1279210f /tests/gtests/guardedalloc | |
parent | 5508cc2d6319729d624b969a24c0a64286f34993 (diff) |
Fix gtests on Windows/MSVC
There were some missing stubs and some tests were specifically
written for Linux. Also, apparently MSVC has a limit of 64K for
the insource strings..
Diffstat (limited to 'tests/gtests/guardedalloc')
-rw-r--r-- | tests/gtests/guardedalloc/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/gtests/guardedalloc/guardedalloc_alignment_test.cc | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/tests/gtests/guardedalloc/CMakeLists.txt b/tests/gtests/guardedalloc/CMakeLists.txt index 394bc0b6700..f4fb4f882ec 100644 --- a/tests/gtests/guardedalloc/CMakeLists.txt +++ b/tests/gtests/guardedalloc/CMakeLists.txt @@ -25,6 +25,7 @@ set(INC . .. ../../../intern/guardedalloc + ../../../source/blender/blenlib ) include_directories(${INC}) diff --git a/tests/gtests/guardedalloc/guardedalloc_alignment_test.cc b/tests/gtests/guardedalloc/guardedalloc_alignment_test.cc index 489cd6178cf..345c3824b63 100644 --- a/tests/gtests/guardedalloc/guardedalloc_alignment_test.cc +++ b/tests/gtests/guardedalloc/guardedalloc_alignment_test.cc @@ -2,6 +2,10 @@ #include "testing/testing.h" +extern "C" { +#include "BLI_utildefines.h" +} + #include "MEM_guardedalloc.h" #define CHECK_ALIGNMENT(ptr, align) EXPECT_EQ(0, (size_t)ptr % align) |