Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

move OpenCL initialization for the unit tests in a shared header file, and support some basic command-line arguments

Browse Source 
--cl_device=1 --cl_platform=1 --allow_opencl_cpu
add chaindemo, test for mass ratios
restore sleeping/activation mode in featherstone demo
Use _VARIADIC_MAX=10 to avoid Google Test issues with Visual Studio 2012, thanks to Mobeen for the report
Enable verbose printf for unit tests
This commit is contained in:
erwincoumans
2014-02-11 10:33:00 -08:00
parent bd5c2ff5ec
commit 122ceacb6d
26 changed files with 389 additions and 1388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
test/OpenCL/AllBullet3Kernels/initCL.h Normal file
View File

@@ -0,0 +1,79 @@
#ifndef INIT_CL_H
#define INIT_CL_H
void initCL()
{
int preferredDeviceIndex=-1;
int preferredPlatformIndex=-1;
bool allowCpuOpenCL=false;
b3CommandLineArgs args(gArgc,gArgv);
args.GetCmdLineArgument("cl_device", preferredDeviceIndex);
args.GetCmdLineArgument("cl_platform", preferredPlatformIndex);
allowCpuOpenCL = args.CheckCmdLineFlag("allow_opencl_cpu");
void* glCtx=0;
void* glDC = 0;
int ciErrNum = 0;
cl_device_type deviceType = CL_DEVICE_TYPE_GPU;
if (allowCpuOpenCL)
deviceType = CL_DEVICE_TYPE_ALL;
// if (useInterop)
// {
// m_data->m_clContext = b3OpenCLUtils::createContextFromType(deviceType, &ciErrNum, glCtx, glDC);
// } else
{
m_clContext = b3OpenCLUtils::createContextFromType(deviceType, &ciErrNum, 0,0,preferredDeviceIndex, preferredPlatformIndex,&m_platformId);
ASSERT_FALSE(m_clContext==0);
}
b3OpenCLPlatformInfo platformInfo;
b3OpenCLUtils::getPlatformInfo(m_platformId,&platformInfo);
b3Printf("OpenCL Platform Name %s\n", platformInfo.m_platformName);
b3Printf("OpenCL Platform Vendor %s\n", platformInfo.m_platformVendor);
b3Printf("OpenCL Platform Version %s\n", platformInfo.m_platformVersion);
ASSERT_EQ(ciErrNum, CL_SUCCESS);
int numDev = b3OpenCLUtils::getNumDevices(m_clContext);
EXPECT_GT(numDev,0);
if (numDev>0)
{
m_clDevice= b3OpenCLUtils::getDevice(m_clContext,0);
ASSERT_FALSE(m_clDevice==0);
m_clQueue = clCreateCommandQueue(m_clContext, m_clDevice, 0, &ciErrNum);
ASSERT_FALSE(m_clQueue==0);
ASSERT_EQ(ciErrNum, CL_SUCCESS);
b3OpenCLDeviceInfo info;
b3OpenCLUtils::getDeviceInfo(m_clDevice,&info);
b3OpenCLUtils::printDeviceInfo(m_clDevice);
m_clDeviceName = info.m_deviceName;
}
}
void exitCL()
{
clReleaseCommandQueue(m_clQueue);
clReleaseContext(m_clContext);
}
#endif //INIT_CL_H

91
test/OpenCL/AllBullet3Kernels/testCompileBullet3BroadphaseKernels.cpp
View File

@@ -4,7 +4,6 @@
#include "Bullet3Common/b3CommandLineArgs.h"
#include "Bullet3OpenCL/Initialize/b3OpenCLUtils.h"
#include "Bullet3OpenCL/BroadphaseCollision/kernels/sapKernels.h"
#include "Bullet3OpenCL/BroadphaseCollision/kernels/sapFastKernels.h"
#include "Bullet3OpenCL/BroadphaseCollision/kernels/gridBroadphaseKernels.h"
extern int gArgc;
@@ -34,7 +33,7 @@ namespace
bool allowCpuOpenCL = false;
initCL(preferredDeviceIndex, preferredPlatformIndex, allowCpuOpenCL);
initCL();
}
virtual ~CompileBullet3BroadphaseKernels()
@@ -46,58 +45,9 @@ namespace
// If the constructor and destructor are not enough for setting up
// and cleaning up each test, you can define the following methods:
void initCL(int preferredDeviceIndex, int preferredPlatformIndex, bool allowCpuOpenCL)
{
void* glCtx=0;
void* glDC = 0;
int ciErrNum = 0;
#include "initCL.h"
cl_device_type deviceType = CL_DEVICE_TYPE_GPU;
if (allowCpuOpenCL)
deviceType = CL_DEVICE_TYPE_ALL;
// if (useInterop)
// {
// m_data->m_clContext = b3OpenCLUtils::createContextFromType(deviceType, &ciErrNum, glCtx, glDC);
// } else
{
m_clContext = b3OpenCLUtils::createContextFromType(deviceType, &ciErrNum, 0,0,preferredDeviceIndex, preferredPlatformIndex,&m_platformId);
ASSERT_FALSE(m_clContext==0);
}
ASSERT_EQ(ciErrNum, CL_SUCCESS);
int numDev = b3OpenCLUtils::getNumDevices(m_clContext);
EXPECT_GT(numDev,0);
if (numDev>0)
{
m_clDevice= b3OpenCLUtils::getDevice(m_clContext,0);
ASSERT_FALSE(m_clDevice==0);
m_clQueue = clCreateCommandQueue(m_clContext, m_clDevice, 0, &ciErrNum);
ASSERT_FALSE(m_clQueue==0);
ASSERT_EQ(ciErrNum, CL_SUCCESS);
b3OpenCLDeviceInfo info;
b3OpenCLUtils::getDeviceInfo(m_clDevice,&info);
m_clDeviceName = info.m_deviceName;
}
}
void exitCL()
{
clReleaseCommandQueue(m_clQueue);
clReleaseContext(m_clContext);
}
virtual void SetUp()
{
@@ -114,42 +64,7 @@ namespace
}
};
TEST_F(CompileBullet3BroadphaseKernels,sapFastKernels)
{
cl_int errNum=0;
cl_program sapFastProg = b3OpenCLUtils::compileCLProgramFromString(m_clContext,m_clDevice,sapFastCL,&errNum,"",0,true);
{
cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,sapFastCL, "computePairsKernelLocalSharedMemoryBatchWrite",&errNum,sapFastProg );
ASSERT_EQ(errNum,CL_SUCCESS);
ASSERT_FALSE(k==0);
clReleaseKernel(k);
}
{
cl_kernel k= b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,sapFastCL, "computePairsIncremental3dSapKernel",&errNum,sapFastProg );
ASSERT_EQ(errNum,CL_SUCCESS);
ASSERT_FALSE(k==0);
clReleaseKernel(k);
}
{
cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,sapFastCL, "computePairsKernelLocalSharedMemoryBatchWrite",&errNum,sapFastProg );
ASSERT_EQ(errNum,CL_SUCCESS);
ASSERT_FALSE(k==0);
clReleaseKernel(k);
}
{
cl_kernel m_computePairsIncremental3dSapKernel= b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,sapFastCL, "computePairsIncremental3dSapKernel",&errNum,sapFastProg );
ASSERT_EQ(errNum,CL_SUCCESS);
ASSERT_FALSE(m_computePairsIncremental3dSapKernel==0);
clReleaseKernel(m_computePairsIncremental3dSapKernel);
}
clReleaseProgram(sapFastProg);
}
TEST_F(CompileBullet3BroadphaseKernels,sapKernels)
{

54
test/OpenCL/AllBullet3Kernels/testCompileBullet3IntegrateUpdateAabbKernels.cpp
View File

@@ -35,7 +35,7 @@ namespace
bool allowCpuOpenCL = false;
initCL(preferredDeviceIndex, preferredPlatformIndex, allowCpuOpenCL);
initCL();
}
virtual ~testCompileBullet3IntegrateUpdateAabbKernels()
@@ -47,58 +47,8 @@ namespace
// If the constructor and destructor are not enough for setting up
// and cleaning up each test, you can define the following methods:
void initCL(int preferredDeviceIndex, int preferredPlatformIndex, bool allowCpuOpenCL)
{
void* glCtx=0;
void* glDC = 0;
int ciErrNum = 0;
cl_device_type deviceType = CL_DEVICE_TYPE_GPU;
if (allowCpuOpenCL)
deviceType = CL_DEVICE_TYPE_ALL;
// if (useInterop)
// {
// m_data->m_clContext = b3OpenCLUtils::createContextFromType(deviceType, &ciErrNum, glCtx, glDC);
// } else
{
m_clContext = b3OpenCLUtils::createContextFromType(deviceType, &ciErrNum, 0,0,preferredDeviceIndex, preferredPlatformIndex,&m_platformId);
ASSERT_FALSE(m_clContext==0);
}
ASSERT_EQ(ciErrNum, CL_SUCCESS);
int numDev = b3OpenCLUtils::getNumDevices(m_clContext);
EXPECT_GT(numDev,0);
if (numDev>0)
{
m_clDevice= b3OpenCLUtils::getDevice(m_clContext,0);
ASSERT_FALSE(m_clDevice==0);
m_clQueue = clCreateCommandQueue(m_clContext, m_clDevice, 0, &ciErrNum);
ASSERT_FALSE(m_clQueue==0);
ASSERT_EQ(ciErrNum, CL_SUCCESS);
b3OpenCLDeviceInfo info;
b3OpenCLUtils::getDeviceInfo(m_clDevice,&info);
m_clDeviceName = info.m_deviceName;
}
}
void exitCL()
{
clReleaseCommandQueue(m_clQueue);
clReleaseContext(m_clContext);
}
#include "initCL.h"
virtual void SetUp()
{

54
test/OpenCL/AllBullet3Kernels/testCompileBullet3JacobiContactSolverKernels.cpp
View File

@@ -33,7 +33,7 @@ namespace
bool allowCpuOpenCL = false;
initCL(preferredDeviceIndex, preferredPlatformIndex, allowCpuOpenCL);
initCL();
}
virtual ~CompileBullet3JacobiContactSolverKernels()
@@ -45,58 +45,8 @@ namespace
// If the constructor and destructor are not enough for setting up
// and cleaning up each test, you can define the following methods:
void initCL(int preferredDeviceIndex, int preferredPlatformIndex, bool allowCpuOpenCL)
{
void* glCtx=0;
void* glDC = 0;
int ciErrNum = 0;
#include "initCL.h"
cl_device_type deviceType = CL_DEVICE_TYPE_GPU;
if (allowCpuOpenCL)
deviceType = CL_DEVICE_TYPE_ALL;
// if (useInterop)
// {
// m_data->m_clContext = b3OpenCLUtils::createContextFromType(deviceType, &ciErrNum, glCtx, glDC);
// } else
{
m_clContext = b3OpenCLUtils::createContextFromType(deviceType, &ciErrNum, 0,0,preferredDeviceIndex, preferredPlatformIndex,&m_platformId);
ASSERT_FALSE(m_clContext==0);
}
ASSERT_EQ(ciErrNum, CL_SUCCESS);
int numDev = b3OpenCLUtils::getNumDevices(m_clContext);
EXPECT_GT(numDev,0);
if (numDev>0)
{
m_clDevice= b3OpenCLUtils::getDevice(m_clContext,0);
ASSERT_FALSE(m_clDevice==0);
m_clQueue = clCreateCommandQueue(m_clContext, m_clDevice, 0, &ciErrNum);
ASSERT_FALSE(m_clQueue==0);
ASSERT_EQ(ciErrNum, CL_SUCCESS);
b3OpenCLDeviceInfo info;
b3OpenCLUtils::getDeviceInfo(m_clDevice,&info);
m_clDeviceName = info.m_deviceName;
}
}
void exitCL()
{
clReleaseCommandQueue(m_clQueue);
clReleaseContext(m_clContext);
}
virtual void SetUp()
{

55
test/OpenCL/AllBullet3Kernels/testCompileBullet3NarrowphaseKernels.cpp
View File

@@ -39,7 +39,7 @@ namespace
bool allowCpuOpenCL = false;
initCL(preferredDeviceIndex, preferredPlatformIndex, allowCpuOpenCL);
initCL();
}
virtual ~CompileBullet3NarrowphaseKernels()
@@ -51,58 +51,7 @@ namespace
// If the constructor and destructor are not enough for setting up
// and cleaning up each test, you can define the following methods:
void initCL(int preferredDeviceIndex, int preferredPlatformIndex, bool allowCpuOpenCL)
{
void* glCtx=0;
void* glDC = 0;
int ciErrNum = 0;
cl_device_type deviceType = CL_DEVICE_TYPE_GPU;
if (allowCpuOpenCL)
deviceType = CL_DEVICE_TYPE_ALL;
// if (useInterop)
// {
// m_data->m_clContext = b3OpenCLUtils::createContextFromType(deviceType, &ciErrNum, glCtx, glDC);
// } else
{
m_clContext = b3OpenCLUtils::createContextFromType(deviceType, &ciErrNum, 0,0,preferredDeviceIndex, preferredPlatformIndex,&m_platformId);
ASSERT_FALSE(m_clContext==0);
}
ASSERT_EQ(ciErrNum, CL_SUCCESS);
int numDev = b3OpenCLUtils::getNumDevices(m_clContext);
EXPECT_GT(numDev,0);
if (numDev>0)
{
m_clDevice= b3OpenCLUtils::getDevice(m_clContext,0);
ASSERT_FALSE(m_clDevice==0);
m_clQueue = clCreateCommandQueue(m_clContext, m_clDevice, 0, &ciErrNum);
ASSERT_FALSE(m_clQueue==0);
ASSERT_EQ(ciErrNum, CL_SUCCESS);
b3OpenCLDeviceInfo info;
b3OpenCLUtils::getDeviceInfo(m_clDevice,&info);
m_clDeviceName = info.m_deviceName;
}
}
void exitCL()
{
clReleaseCommandQueue(m_clQueue);
clReleaseContext(m_clContext);
}
#include "initCL.h"
virtual void SetUp()
{

55
test/OpenCL/AllBullet3Kernels/testCompileBullet3PgsContactSolverKernels.cpp
View File

@@ -39,7 +39,7 @@ namespace
bool allowCpuOpenCL = false;
initCL(preferredDeviceIndex, preferredPlatformIndex, allowCpuOpenCL);
initCL();
}
virtual ~CompileBullet3PgsContactSolverKernels()
@@ -51,58 +51,7 @@ namespace
// If the constructor and destructor are not enough for setting up
// and cleaning up each test, you can define the following methods:
void initCL(int preferredDeviceIndex, int preferredPlatformIndex, bool allowCpuOpenCL)
{
void* glCtx=0;
void* glDC = 0;
int ciErrNum = 0;
cl_device_type deviceType = CL_DEVICE_TYPE_GPU;
if (allowCpuOpenCL)
deviceType = CL_DEVICE_TYPE_ALL;
// if (useInterop)
// {
// m_data->m_clContext = b3OpenCLUtils::createContextFromType(deviceType, &ciErrNum, glCtx, glDC);
// } else
{
m_clContext = b3OpenCLUtils::createContextFromType(deviceType, &ciErrNum, 0,0,preferredDeviceIndex, preferredPlatformIndex,&m_platformId);
ASSERT_FALSE(m_clContext==0);
}
ASSERT_EQ(ciErrNum, CL_SUCCESS);
int numDev = b3OpenCLUtils::getNumDevices(m_clContext);
EXPECT_GT(numDev,0);
if (numDev>0)
{
m_clDevice= b3OpenCLUtils::getDevice(m_clContext,0);
ASSERT_FALSE(m_clDevice==0);
m_clQueue = clCreateCommandQueue(m_clContext, m_clDevice, 0, &ciErrNum);
ASSERT_FALSE(m_clQueue==0);
ASSERT_EQ(ciErrNum, CL_SUCCESS);
b3OpenCLDeviceInfo info;
b3OpenCLUtils::getDeviceInfo(m_clDevice,&info);
m_clDeviceName = info.m_deviceName;
}
}
void exitCL()
{
clReleaseCommandQueue(m_clQueue);
clReleaseContext(m_clContext);
}
#include "initCL.h"
virtual void SetUp()
{

55
test/OpenCL/AllBullet3Kernels/testCompileBullet3PgsJointSolverKernels.cpp
View File

@@ -33,7 +33,7 @@ namespace
bool allowCpuOpenCL = false;
initCL(preferredDeviceIndex, preferredPlatformIndex, allowCpuOpenCL);
initCL();
}
virtual ~testCompileBullet3PgsJointSolverKernels()
@@ -45,58 +45,7 @@ namespace
// If the constructor and destructor are not enough for setting up
// and cleaning up each test, you can define the following methods:
void initCL(int preferredDeviceIndex, int preferredPlatformIndex, bool allowCpuOpenCL)
{
void* glCtx=0;
void* glDC = 0;
int ciErrNum = 0;
cl_device_type deviceType = CL_DEVICE_TYPE_GPU;
if (allowCpuOpenCL)
deviceType = CL_DEVICE_TYPE_ALL;
// if (useInterop)
// {
// m_data->m_clContext = b3OpenCLUtils::createContextFromType(deviceType, &ciErrNum, glCtx, glDC);
// } else
{
m_clContext = b3OpenCLUtils::createContextFromType(deviceType, &ciErrNum, 0,0,preferredDeviceIndex, preferredPlatformIndex,&m_platformId);
ASSERT_FALSE(m_clContext==0);
}
ASSERT_EQ(ciErrNum, CL_SUCCESS);
int numDev = b3OpenCLUtils::getNumDevices(m_clContext);
EXPECT_GT(numDev,0);
if (numDev>0)
{
m_clDevice= b3OpenCLUtils::getDevice(m_clContext,0);
ASSERT_FALSE(m_clDevice==0);
m_clQueue = clCreateCommandQueue(m_clContext, m_clDevice, 0, &ciErrNum);
ASSERT_FALSE(m_clQueue==0);
ASSERT_EQ(ciErrNum, CL_SUCCESS);
b3OpenCLDeviceInfo info;
b3OpenCLUtils::getDeviceInfo(m_clDevice,&info);
m_clDeviceName = info.m_deviceName;
}
}
void exitCL()
{
clReleaseCommandQueue(m_clQueue);
clReleaseContext(m_clContext);
}
#include "initCL.h"
virtual void SetUp()
{

54
test/OpenCL/AllBullet3Kernels/testCompileBullet3RaycastKernels.cpp
View File

@@ -33,7 +33,7 @@ namespace
bool allowCpuOpenCL = false;
initCL(preferredDeviceIndex, preferredPlatformIndex, allowCpuOpenCL);
initCL();
}
virtual ~CompileBullet3RaycastKernels()
@@ -45,58 +45,8 @@ namespace
// If the constructor and destructor are not enough for setting up
// and cleaning up each test, you can define the following methods:
void initCL(int preferredDeviceIndex, int preferredPlatformIndex, bool allowCpuOpenCL)
{
void* glCtx=0;
void* glDC = 0;
int ciErrNum = 0;
cl_device_type deviceType = CL_DEVICE_TYPE_GPU;
if (allowCpuOpenCL)
deviceType = CL_DEVICE_TYPE_ALL;
// if (useInterop)
// {
// m_data->m_clContext = b3OpenCLUtils::createContextFromType(deviceType, &ciErrNum, glCtx, glDC);
// } else
{
m_clContext = b3OpenCLUtils::createContextFromType(deviceType, &ciErrNum, 0,0,preferredDeviceIndex, preferredPlatformIndex,&m_platformId);
ASSERT_FALSE(m_clContext==0);
}
ASSERT_EQ(ciErrNum, CL_SUCCESS);
int numDev = b3OpenCLUtils::getNumDevices(m_clContext);
EXPECT_GT(numDev,0);
if (numDev>0)
{
m_clDevice= b3OpenCLUtils::getDevice(m_clContext,0);
ASSERT_FALSE(m_clDevice==0);
m_clQueue = clCreateCommandQueue(m_clContext, m_clDevice, 0, &ciErrNum);
ASSERT_FALSE(m_clQueue==0);
ASSERT_EQ(ciErrNum, CL_SUCCESS);
b3OpenCLDeviceInfo info;
b3OpenCLUtils::getDeviceInfo(m_clDevice,&info);
m_clDeviceName = info.m_deviceName;
}
}
void exitCL()
{
clReleaseCommandQueue(m_clQueue);
clReleaseContext(m_clContext);
}
#include "initCL.h"
virtual void SetUp()
{

66
test/OpenCL/AllBullet3Kernels/testExecuteBullet3NarrowphaseKernels.cpp
View File

@@ -1,9 +1,9 @@
#include <gtest/gtest.h>
#include "Bullet3Common/b3Logging.h"
#include "Bullet3Common/b3CommandLineArgs.h"
#include "Bullet3OpenCL/Initialize/b3OpenCLUtils.h"
#include "Bullet3OpenCL/Initialize/b3OpenCLUtils.h"
#include "Bullet3Common/b3CommandLineArgs.h"
#include "Bullet3OpenCL/NarrowphaseCollision/kernels/satKernels.h"
#include "Bullet3OpenCL/NarrowphaseCollision/kernels/mprKernels.h"
#include "Bullet3OpenCL/NarrowphaseCollision/kernels/satConcaveKernels.h"
@@ -37,13 +37,8 @@ namespace
m_platformId(0)
{
// You can do set-up work for each test here.
b3CommandLineArgs args(gArgc,gArgv);
int preferredDeviceIndex=-1;
int preferredPlatformIndex = -1;
bool allowCpuOpenCL = false;
initCL(preferredDeviceIndex, preferredPlatformIndex, allowCpuOpenCL);
initCL();
}
virtual ~ExecuteBullet3NarrowphaseKernels()
@@ -55,59 +50,8 @@ namespace
// If the constructor and destructor are not enough for setting up
// and cleaning up each test, you can define the following methods:
void initCL(int preferredDeviceIndex, int preferredPlatformIndex, bool allowCpuOpenCL)
{
void* glCtx=0;
void* glDC = 0;
int ciErrNum = 0;
cl_device_type deviceType = CL_DEVICE_TYPE_GPU;
if (allowCpuOpenCL)
deviceType = CL_DEVICE_TYPE_ALL;
// if (useInterop)
// {
// m_data->m_clContext = b3OpenCLUtils::createContextFromType(deviceType, &ciErrNum, glCtx, glDC);
// } else
{
m_clContext = b3OpenCLUtils::createContextFromType(deviceType, &ciErrNum, 0,0,preferredDeviceIndex, preferredPlatformIndex,&m_platformId);
ASSERT_FALSE(m_clContext==0);
}
ASSERT_EQ(ciErrNum, CL_SUCCESS);
int numDev = b3OpenCLUtils::getNumDevices(m_clContext);
EXPECT_GT(numDev,0);
if (numDev>0)
{
m_clDevice= b3OpenCLUtils::getDevice(m_clContext,0);
ASSERT_FALSE(m_clDevice==0);
m_clQueue = clCreateCommandQueue(m_clContext, m_clDevice, 0, &ciErrNum);
ASSERT_FALSE(m_clQueue==0);
ASSERT_EQ(ciErrNum, CL_SUCCESS);
b3OpenCLDeviceInfo info;
b3OpenCLUtils::getDeviceInfo(m_clDevice,&info);
m_clDeviceName = info.m_deviceName;
}
}
void exitCL()
{
clReleaseCommandQueue(m_clQueue);
clReleaseContext(m_clContext);
}
#include "initCL.h"
virtual void SetUp()
{

4
test/TestBullet3OpenCL/main.cpp
View File

@@ -9,7 +9,7 @@ void myerrorprintf(const char* msg)
printf(msg);
}
static bool sVerboseWarning = false;
static bool sVerboseWarning = true;
void mywarningprintf(const char* msg)
{
@@ -20,7 +20,7 @@ void mywarningprintf(const char* msg)
}
}
static bool sVerbosePrintf=false;
static bool sVerbosePrintf=true;//false;
void myprintf(const char* msg)
{

6
test/TestBullet3OpenCL/premake4.lua
View File

@@ -6,6 +6,12 @@ function createProject(vendor)
-- defines { }
if os.is("Windows") then
--see http://stackoverflow.com/questions/12558327/google-test-in-visual-studio-2012
defines {"_VARIADIC_MAX=10"}
end
targetdir "../../bin"
initOpenCL(vendor)

4
test/gtest-1.7.0/premake4.lua
View File

@@ -5,6 +5,10 @@
files{"src/gtest-all.cc"}
--defines {"GTEST_HAS_PTHREAD=1"}
--see http://stackoverflow.com/questions/12558327/google-test-in-visual-studio-2012
defines {"_VARIADIC_MAX=10"}
--targetdir "../../lib"
includedirs {